[Contextual Search] Fixes ContentView regressions.

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

 // Copyright 2015 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.
 
 package org.chromium.chrome.browser.contextualsearch;
 
 import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_END_DEVICE;
 import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_PHONE;
 import static org.chromium.content.browser.test.util.CriteriaHelper.DEFAULT_POLLING_INTERVAL;
 
@@ skipping 15 matching lines @@
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.chrome.R;
 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;
 import org.chromium.chrome.browser.gsa.GSAContextDisplaySelection;
 import org.chromium.chrome.browser.omnibox.UrlBar;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.EmptyTabModelSelectorObserver;
 import org.chromium.chrome.browser.tabmodel.TabModelSelectorObserver;
 import org.chromium.chrome.browser.tabmodel.TabModelUtils;
 import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.chrome.test.util.ChromeTabUtils;
 import org.chromium.chrome.test.util.OmniboxTestUtils;
 import org.chromium.chrome.test.util.TestHttpServerClient;
 import org.chromium.components.navigation_interception.NavigationParams;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.DOMUtils;
 import org.chromium.content.browser.test.util.TouchCommon;
 import org.chromium.ui.base.PageTransition;
 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.
  */
 @CommandLineFlags.Add(ChromeSwitches.ENABLE_CONTEXTUAL_SEARCH_FOR_TESTING)
 public class ContextualSearchManagerTest extends ChromeActivityTestCaseBase<ChromeActivity> {
 
     private static final String TEST_PAGE =
             TestHttpServerClient.getUrl("chrome/test/data/android/contextualsearch/tap_test.html");
     private static final int TEST_TIMEOUT = 15000;
 
@@ skipping 16 matching lines @@
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
 
         mManager = getActivity().getContextualSearchManager();
 
         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());
 
             mPolicy.overrideDecidedStateForTesting(true);
             resetCounters();
         }
 
         IntentFilter filter = new IntentFilter(Intent.ACTION_VIEW);
         filter.addCategory(Intent.CATEGORY_BROWSABLE);
@@ skipping 173 matching lines @@
                 mFakeServer.getLoadedUrl() != null
                 && !mFakeServer.getLoadedUrl().contains(CONTEXTUAL_SEARCH_PREFETCH_PARAM));
     }
 
     private void assertNoSearchesLoaded() {
         assertEquals(0, mFakeServer.loadedUrlCount());
         assertLoadedNoUrl();
     }
 
     private void assertContentViewCoreCreated() {
-        assertTrue(mFakeServer.isSearchContentViewCreated());
+        assertTrue(mFakeServer.didCreateContentView());
     }
 
     private void assertNoContentViewCore() {
-        assertFalse(mFakeServer.isSearchContentViewCreated());
+        assertFalse(mFakeServer.didCreateContentView());
     }
 
     /**
      * Asserts that the tap triggered promo counter is enabled and at the specified count.
      */
     private void assertTapPromoCounterEnabledAt(int expectedCount) {
         assertTrue(mPolicy.getPromoTapCounter().isEnabled());
         assertEquals(expectedCount, mPolicy.getPromoTapCounter().getCount());
     }
 
@@ skipping 1671 matching lines @@
         // Click elsewhere to clear the selection.
         clickNode("question-mark");
         waitForSelectionToBe(null);
 
         // Now that the Panel was opened at least once, the Promo should not show again.
         longPressNode("intelligence");
         waitForPanelToPeekAndAssert();
         assertFalse(mPanelDelegate.isPeekPromoVisible());
     }
 }