Overlay content is its own class

chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java
index 426a088cebd79862aae14c7f3b60fd7e1cad861b..9aaaaede37207c49b22428af343125d9c60013d8 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java
@@ -91,9 +91,9 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
         if (mManager != null) {
             mPanelDelegate = mManager.getContextualSearchPanelDelegate();
             mFakeServer = new ContextualSearchFakeServer(mManager,
-                    mPanelDelegate.getContentController());
+                    mManager.getOverlayContentDelegate());
+            mPanelDelegate.setOverlayPanelContent(mFakeServer);
             mManager.setNetworkCommunicator(mFakeServer);
-            mPanelDelegate.setContentController(mFakeServer);
             mSelectionController = mManager.getSelectionController();
             mPolicy = ContextualSearchPolicy.getInstance(getActivity());
 
@@ -301,11 +301,11 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
     /**
      * Fakes navigation of the Content View with the given httpResult code.
      * The URL of the navigation is the one requested previously.
-     * @param httpResultCode The result to fake.
+     * @param isFailure If the request resulted in a failure.
      */
-    private void fakeContentViewDidNavigate(int httpResultCode) {
+    private void fakeContentViewDidNavigate(boolean isFailure) {
         String url = mFakeServer.getLoadedUrl();
-        mManager.handleDidNavigateMainFrame(url, httpResultCode);
+        mManager.handleDidNavigateMainFrame(url, isFailure);
     }
 
     /**
@@ -829,7 +829,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
         assertEquals(1, mFakeServer.loadedUrlCount());
 
         // When the second request succeeds, we should not issue a new request.
-        fakeContentViewDidNavigate(200);
+        fakeContentViewDidNavigate(false);
         assertLoadedLowPriorityUrl();
         assertEquals(1, mFakeServer.loadedUrlCount());
 
@@ -859,7 +859,7 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
         assertEquals(1, mFakeServer.loadedUrlCount());
 
         // When the second request fails, we should not issue a new request.
-        fakeContentViewDidNavigate(500);
+        fakeContentViewDidNavigate(true);
         assertLoadedLowPriorityUrl();
         assertEquals(1, mFakeServer.loadedUrlCount());