[Contextual Search] Add Mojo-enabled API component.

chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java
index 8c30ddb9974b797f0f7304e990888ebe114881ab..2a5ad6722a26a8c817dcb024198c83f953d21ade 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java
@@ -46,7 +46,6 @@ import org.chromium.content.browser.ContextualSearchClient;
 import org.chromium.content_public.browser.GestureStateListener;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.NavigationEntry;
-import org.chromium.content_public.browser.WebContentsObserver;
 import org.chromium.content_public.common.TopControlsState;
 import org.chromium.ui.base.WindowAndroid;
 
@@ -87,7 +86,6 @@ public class ContextualSearchManager extends ContextualSearchObservable
     private final ViewTreeObserver.OnGlobalFocusChangeListener mOnFocusChangeListener;
 
     private final WindowAndroid mWindowAndroid;
-    private WebContentsObserver mSearchWebContentsObserver;
     private ContextualSearchContentViewDelegate mSearchContentViewDelegate;
     private final ContextualSearchTabPromotionDelegate mTabPromotionDelegate;
     private TabModelSelectorTabObserver mTabModelSelectorTabObserver;
@@ -855,12 +853,25 @@ public class ContextualSearchManager extends ContextualSearchObservable
 
         @Override
         public void onContentViewCreated(ContentViewCore contentViewCore) {
+            // TODO(donnd): move to OverlayPanelContent
+            if (mPolicy.shouldEnableOverlayApi()) {
+                // Enable a JavaScript communication channel between our service and the new view.
+                nativeAddViewForContextualSearchApi(
+                        mNativeContextualSearchManagerPtr, contentViewCore);
+            }
+
             // TODO(mdjones): Move SearchContentViewDelegate ownership to panel.
             mSearchContentViewDelegate.setContextualSearchContentViewCore(contentViewCore);
         }
 
         @Override
-        public void onContentViewDestroyed() {
+        public void onContentViewDestroyed(int renderProcessHostId) {
+            if (mPolicy.shouldEnableOverlayApi()) {
+                // Enable a JavaScript communication channel between our service and the new view.
+                nativeRemoveViewForContextualSearchApi(
+                        mNativeContextualSearchManagerPtr, renderProcessHostId);
+            }
+
             if (mSearchContentViewDelegate != null) {
                 mSearchContentViewDelegate.releaseContextualSearchContentViewCore();
             }
@@ -1196,4 +1207,8 @@ public class ContextualSearchManager extends ContextualSearchObservable
     private native void nativeGatherSurroundingText(long nativeContextualSearchManager,
             String selection, boolean useResolvedSearchTerm, ContentViewCore baseContentViewCore,
             boolean maySendBasePageUrl);
+    private native void nativeAddViewForContextualSearchApi(
+            long nativeContextualSearchManager, ContentViewCore overlayContentViewCore);
+    private native void nativeRemoveViewForContextualSearchApi(
+            long nativeContextualSearchManager, int renderProcessHostId);
 }