Add an interface to gather text surrounding the selection.

content/browser/android/content_view_core_impl.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/android/content_view_core_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 1521 matching lines @@
     accessibility_state->ResetAccessibilityMode();
     if (host_impl)
       host_impl->ResetAccessibilityMode();
   }
 }
 
 void ContentViewCoreImpl::OnTextSurroundingSelectionResponse(
     const base::string16& content,
     int start_offset,
     int end_offset) {
-  JNIEnv* env = AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
-  if (obj.is_null())
-    return;
-
-  ScopedJavaLocalRef<jstring> jcontent = ConvertUTF16ToJavaString(env, content);
-  Java_ContentViewCore_onTextSurroundingSelectionResponse(
-      env, obj.obj(), jcontent.obj(), start_offset, end_offset);
+  if (text_surroundings_delegate_ != NULL) {
+    text_surroundings_delegate_->OnTextSurroundingSelectionResponse(
+        content, start_offset, end_offset);
+  }
 }
 
 void ContentViewCoreImpl::SendOrientationChangeEventInternal() {
   RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid();
   if (rwhv)
     rwhv->UpdateScreenInfo(GetViewAndroid());
 
   // TODO(mlamouri): temporary plumbing for Screen Orientation, this will change
   // in the future. The OnResize IPC message sent from UpdateScreenInfo() will
   // propagate the information.
@@ skipping 48 matching lines @@
   return GetRenderProcessIdFromRenderViewHost(
       web_contents_->GetRenderViewHost());
 }
 
 void ContentViewCoreImpl::SetBackgroundOpaque(JNIEnv* env, jobject jobj,
     jboolean opaque) {
   if (GetRenderWidgetHostViewAndroid())
     GetRenderWidgetHostViewAndroid()->SetBackgroundOpaque(opaque);
 }
 
-void ContentViewCoreImpl::TextSurroundingSelectionRequest(
-    JNIEnv*, jobject, jint max_length) {
+void ContentViewCoreImpl::TextSurroundingSelectionRequest(int max_length) {
   RenderFrameHost* focused_frame = web_contents_->GetFocusedFrame();
 
   focused_frame->Send(new FrameMsg_TextSurroundingSelectionRequest(
       focused_frame->GetRoutingID(), max_length));
 }
 
 void ContentViewCoreImpl::OnSmartClipDataExtracted(
     const base::string16& result) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
@@ skipping 25 matching lines @@
       reinterpret_cast<ui::WindowAndroid*>(window_android),
       retained_objects_set);
   return reinterpret_cast<intptr_t>(view);
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content