[Contextual Search] Fixes ContentView regressions.

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 174b782f3168b5a0f9a4030bc09294ea0af3c0ae..491327e9e78d32c1c93612dd6a9c9e5bf7648bb1 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
@@ -33,6 +33,7 @@ import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayContentDelegate;
+import org.chromium.chrome.browser.compositor.bottombar.OverlayContentProgressObserver;
 import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanel.PanelState;
 import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanelDelegate;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler;
@@ -59,6 +60,8 @@ import org.chromium.ui.touch_selection.SelectionEventType;
 
 import java.util.concurrent.TimeoutException;
 
+// TODO(pedrosimonetti): add tests for recent regressions.

[aurimas (slooooooooow), 2015/10/14 21:56:11]

Is there a bug tracking that? Please mention it here.

[pedro (no code reviews), 2015/10/14 22:43:37]

Done.

+
 /**
  * Tests the Contextual Search Manager using instrumentation tests.
  */
@@ -95,8 +98,11 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
         if (mManager != null) {
             mPanelDelegate = mManager.getContextualSearchPanelDelegate();
             mFakeServer = new ContextualSearchFakeServer(mManager,
-                    mManager.getOverlayContentDelegate());
-            mPanelDelegate.setOverlayPanelContent(mFakeServer);
+                    mManager.getOverlayContentDelegate(),
+                    new OverlayContentProgressObserver(),
+                    getActivity());
+
+            mPanelDelegate.setOverlayPanelContentFactory(mFakeServer);
             mManager.setNetworkCommunicator(mFakeServer);
             mSelectionController = mManager.getSelectionController();
             mPolicy = ContextualSearchPolicy.getInstance(getActivity());
@@ -290,11 +296,11 @@ public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<Chro
     }
 
     private void assertContentViewCoreCreated() {
-        assertTrue(mFakeServer.isSearchContentViewCreated());
+        assertTrue(mFakeServer.didCreateContentView());
     }
 
     private void assertNoContentViewCore() {
-        assertFalse(mFakeServer.isSearchContentViewCreated());
+        assertFalse(mFakeServer.didCreateContentView());
     }
 
     /**