Remove search::IsQueryExtractionEnabled

chrome/browser/ui/search/instant_extended_interactive_uitest.cc

 // Copyright 2013 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 <stdint.h>
 
 #include <sstream>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ skipping 128 matching lines @@
         first_most_visited_item_id_(0),
         on_native_suggestions_calls_(0),
         on_change_calls_(0),
         submit_count_(0),
         on_esc_key_press_event_calls_(0),
         on_focus_changed_calls_(0),
         is_focused_(false) {}
 
  protected:
   void SetUpInProcessBrowserTestFixture() override {
-    search::EnableQueryExtractionForTesting();
     ASSERT_TRUE(https_test_server().Start());
     GURL instant_url =
         https_test_server().GetURL("/instant_extended.html?strk=1&");
     GURL ntp_url =
         https_test_server().GetURL("/instant_extended_ntp.html?strk=1&");
     InstantTestBase::Init(instant_url, ntp_url, false);
   }
 
   int64_t GetHistogramCount(const char* name) {
     base::HistogramBase* histogram =
@@ skipping 90 matching lines @@
 };
 
 class InstantExtendedPrefetchTest : public InstantExtendedTest {
  public:
   InstantExtendedPrefetchTest()
       : factory_(new net::URLFetcherImplFactory()),
         fake_factory_(new net::FakeURLFetcherFactory(factory_.get())) {
   }
 
   void SetUpInProcessBrowserTestFixture() override {
-    search::EnableQueryExtractionForTesting();
     ASSERT_TRUE(https_test_server().Start());
     GURL instant_url =
         https_test_server().GetURL("/instant_extended.html?strk=1&");
     GURL ntp_url =
         https_test_server().GetURL("/instant_extended_ntp.html?strk=1&");
     InstantTestBase::Init(instant_url, ntp_url, true);
   }
 
   net::FakeURLFetcherFactory* fake_factory() { return fake_factory_.get(); }
 
@@ skipping 45 matching lines @@
         ThemeServiceFactory::GetThemeForProfile(
             ExtensionBrowserTest::browser()->profile());
     ASSERT_NE(static_cast<extensions::Extension*>(NULL), new_theme);
     ASSERT_EQ(new_theme->name(), theme_name);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InstantPolicyTest);
 };
 
-IN_PROC_BROWSER_TEST_F(InstantExtendedTest, SearchReusesInstantTab) {
+IN_PROC_BROWSER_TEST_F(InstantExtendedTest, SearchDoesntReuseInstantTab) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmnibox();
 
-  content::WindowedNotificationObserver observer(
-      chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,

[Marc Treib, 2016/08/09 10:23:43]

This notification doesn't get sent anymore for SRPs - without query extraction,
we don't even bother checking for instant support.

-      content::NotificationService::AllSources());
   SetOmniboxText("flowers");
   PressEnterAndWaitForFrameLoad();
-  observer.Wait();
 
   // Just did a regular search.
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_THAT(active_tab->GetURL().spec(), HasSubstr("q=flowers"));
   ASSERT_TRUE(UpdateSearchState(active_tab));
   ASSERT_EQ(0, submit_count_);
 
   SetOmniboxText("puppies");
   PressEnterAndWaitForNavigation();
 
-  // Should have reused the tab and sent an onsubmit message.
+  // Should not have reused the tab.
   active_tab = browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_THAT(active_tab->GetURL().spec(), HasSubstr("q=puppies"));
   ASSERT_TRUE(UpdateSearchState(active_tab));
-  EXPECT_EQ(1, submit_count_);
+  EXPECT_EQ(0, submit_count_);
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        SearchDoesntReuseInstantTabWithoutSupport) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmnibox();
 
   // Don't wait for the navigation to complete.
   SetOmniboxText("flowers");
   browser()->window()->GetLocationBar()->AcceptInput();
 
   SetOmniboxText("puppies");
   browser()->window()->GetLocationBar()->AcceptInput();
 
   // Should not have reused the tab.
   ASSERT_THAT(
       browser()->tab_strip_model()->GetActiveWebContents()->GetURL().spec(),
       HasSubstr("q=puppies"));
 }
 
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        TypedSearchURLDoesntReuseInstantTab) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmnibox();
 
-  // Create an observer to wait for the instant tab to support Instant.
-  content::WindowedNotificationObserver observer_1(
-      chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
-      content::NotificationService::AllSources());
   SetOmniboxText("flowers");
   PressEnterAndWaitForFrameLoad();
-  observer_1.Wait();
 
   // Just did a regular search.
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_THAT(active_tab->GetURL().spec(), HasSubstr("q=flowers"));
   ASSERT_TRUE(UpdateSearchState(active_tab));
   ASSERT_EQ(0, submit_count_);
 
   // Typed in a search URL "by hand".
-  content::WindowedNotificationObserver observer_2(
-      chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
-      content::NotificationService::AllSources());
   SetOmniboxText(instant_url().Resolve("#q=puppies").spec());
   PressEnterAndWaitForNavigation();
-  observer_2.Wait();
 
   // Should not have reused the tab.
   active_tab = browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_THAT(active_tab->GetURL().spec(), HasSubstr("q=puppies"));
 }
 
 // Test to verify that switching tabs should not dispatch onmostvisitedchanged
 // events.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, NoMostVisitedChangedOnTabSwitch) {
   // Initialize Instant.
@@ skipping 126 matching lines @@
   // Install a new theme.
   ASSERT_NO_FATAL_FAILURE(InstallThemeAndVerify("theme2", "snowflake theme"));
 
   // Confirm that new tab is notified about the theme changed event.
   on_theme_changed_calls = 0;
   EXPECT_TRUE(GetIntFromJS(active_tab, "onThemeChangedCalls",
                            &on_theme_changed_calls));
   EXPECT_EQ(2, on_theme_changed_calls);
 }
 
-// Flaky on all bots.  http://crbug.com/253092
-// Test to verify that the omnibox search query is updated on browser
-// back button press event.
-IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
-                       DISABLED_UpdateSearchQueryOnBackNavigation) {
-  ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-
-  // Focus omnibox and confirm overlay isn't shown.
-  FocusOmnibox();
-
-  // Create an observer to wait for the instant tab to support Instant.
-  content::WindowedNotificationObserver observer(
-      chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
-      content::NotificationService::AllSources());
-
-  SetOmniboxText("flowers");
-  // Commit the search by pressing 'Enter'.
-  PressEnterAndWaitForNavigation();
-  observer.Wait();
-
-  EXPECT_EQ(ASCIIToUTF16("flowers"), omnibox()->GetText());
-
-  // Typing in the new search query in omnibox.
-  SetOmniboxText("cattles");
-  // Commit the search by pressing 'Enter'.
-  PressEnterAndWaitForNavigation();
-  // 'Enter' commits the query as it was typed. This creates a navigation entry
-  // in the history.
-  EXPECT_EQ(ASCIIToUTF16("cattles"), omnibox()->GetText());
-
-  content::WebContents* active_tab =
-      browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_TRUE(active_tab->GetController().CanGoBack());
-  content::WindowedNotificationObserver load_stop_observer(
-      content::NOTIFICATION_LOAD_STOP,
-      content::Source<content::NavigationController>(
-          &active_tab->GetController()));
-  active_tab->GetController().GoBack();
-  load_stop_observer.Wait();
-
-  EXPECT_EQ(ASCIIToUTF16("flowers"), omnibox()->GetText());
-  // Commit the search by pressing 'Enter'.
-  FocusOmnibox();
-  PressEnterAndWaitForNavigation();
-  EXPECT_EQ(ASCIIToUTF16("flowers"), omnibox()->GetText());
-}
-
-// Flaky: crbug.com/253092.
-// Test to verify that the omnibox search query is updated on browser
-// forward button press events.
-IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
-                       DISABLED_UpdateSearchQueryOnForwardNavigation) {
-  ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-
-  // Focus omnibox and confirm overlay isn't shown.
-  FocusOmnibox();
-
-  // Create an observer to wait for the instant tab to support Instant.
-  content::WindowedNotificationObserver observer(
-      chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
-      content::NotificationService::AllSources());
-
-  SetOmniboxText("flowers");
-  // Commit the search by pressing 'Enter'.
-  PressEnterAndWaitForNavigation();
-  observer.Wait();
-
-  EXPECT_EQ(ASCIIToUTF16("flowers"), omnibox()->GetText());
-
-  // Typing in the new search query in omnibox.
-  SetOmniboxText("cattles");
-  // Commit the search by pressing 'Enter'.
-  PressEnterAndWaitForNavigation();
-  // 'Enter' commits the query as it was typed. This creates a navigation entry
-  // in the history.
-  EXPECT_EQ(ASCIIToUTF16("cattles"), omnibox()->GetText());
-
-  content::WebContents* active_tab =
-      browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_TRUE(active_tab->GetController().CanGoBack());
-  content::WindowedNotificationObserver load_stop_observer(
-      content::NOTIFICATION_LOAD_STOP,
-      content::Source<content::NavigationController>(
-          &active_tab->GetController()));
-  active_tab->GetController().GoBack();
-  load_stop_observer.Wait();
-
-  EXPECT_EQ(ASCIIToUTF16("flowers"), omnibox()->GetText());
-
-  active_tab = browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_TRUE(active_tab->GetController().CanGoForward());
-  content::WindowedNotificationObserver load_stop_observer_2(
-      content::NOTIFICATION_LOAD_STOP,
-      content::Source<content::NavigationController>(
-          &active_tab->GetController()));
-  active_tab->GetController().GoForward();
-  load_stop_observer_2.Wait();
-
-  // Commit the search by pressing 'Enter'.
-  FocusOmnibox();
-  EXPECT_EQ(ASCIIToUTF16("cattles"), omnibox()->GetText());
-  PressEnterAndWaitForNavigation();
-  EXPECT_EQ(ASCIIToUTF16("cattles"), omnibox()->GetText());
-}
-
 // Flaky on all bots since re-enabled in r208032, crbug.com/253092
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, DISABLED_NavigateBackToNTP) {

[Marc Treib, 2016/08/09 10:23:43]

Since parts of this test got removed, it might be worth a try to re-enable it,
but I won't do that in the same CL.

   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmnibox();
 
   // Open a new tab page.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(chrome::kChromeUINewTabURL),
       NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB |
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   EXPECT_EQ(2, browser()->tab_strip_model()->count());
 
-  content::WindowedNotificationObserver observer(
-      chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
-      content::NotificationService::AllSources());
   SetOmniboxText("flowers");
   PressEnterAndWaitForNavigation();
-  observer.Wait();
 
-  EXPECT_EQ(ASCIIToUTF16("flowers"), omnibox()->GetText());
-
-  // Typing in the new search query in omnibox.
-  // Commit the search by pressing 'Enter'.
-  SetOmniboxText("cattles");
-  PressEnterAndWaitForNavigation();
-
-  // 'Enter' commits the query as it was typed. This creates a navigation entry
-  // in the history.
-  EXPECT_EQ(ASCIIToUTF16("cattles"), omnibox()->GetText());
-
-  // Navigate back to "flowers" search result page.
+  // Navigate back to NTP.
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_TRUE(active_tab->GetController().CanGoBack());
   content::WindowedNotificationObserver load_stop_observer(
       content::NOTIFICATION_LOAD_STOP,
       content::Source<content::NavigationController>(
           &active_tab->GetController()));
   active_tab->GetController().GoBack();
   load_stop_observer.Wait();
 
-  EXPECT_EQ(ASCIIToUTF16("flowers"), omnibox()->GetText());
-
-  // Navigate back to NTP.
-  active_tab = browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_TRUE(active_tab->GetController().CanGoBack());
-  content::WindowedNotificationObserver load_stop_observer_2(
-      content::NOTIFICATION_LOAD_STOP,
-      content::Source<content::NavigationController>(
-          &active_tab->GetController()));
-  active_tab->GetController().GoBack();
-  load_stop_observer_2.Wait();
-
   active_tab = browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_TRUE(search::IsInstantNTP(active_tab));
 }
 
 // Flaky: crbug.com/267119
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        DISABLED_DispatchMVChangeEventWhileNavigatingBackToNTP) {
   // Setup Instant.
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmnibox();
@@ skipping 59 matching lines @@
 
   OmniboxFieldTrial::kDefaultMinimumTimeBetweenSuggestQueriesMs = 0;
 
   // Set the fake response for search query.
   fake_factory()->SetFakeResponse(instant_url().Resolve("#q=flowers"),
                                   "",
                                   net::HTTP_OK,
                                   net::URLRequestStatus::SUCCESS);
 
   // Navigate to a search results page.
-  content::WindowedNotificationObserver observer(
-      chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
-      content::NotificationService::AllSources());
   SetOmniboxText("flowers");
   PressEnterAndWaitForNavigation();
-  observer.Wait();
 
   // Set the fake response for suggest request. Response has prefetch details.
   // Ensure that the page received the suggest response, then add another
   // keystroke to allow the asynchronously-received inline autocomplete
   // suggestion to actually be inlined (which in turn triggers it to prefetch).
   fake_factory()->SetFakeResponse(
       instant_url().Resolve("#q=pup"),
       "[\"pup\",[\"puppy\", \"puppies\"],[],[],"
       "{\"google:clientdata\":{\"phi\": 0},"
           "\"google:suggesttype\":[\"QUERY\", \"QUERY\"],"
@@ skipping 44 matching lines @@
 
   OmniboxFieldTrial::kDefaultMinimumTimeBetweenSuggestQueriesMs = 0;
 
   // Set the fake response for search query.
   fake_factory()->SetFakeResponse(instant_url().Resolve("#q=flowers"),
                                   "",
                                   net::HTTP_OK,
                                   net::URLRequestStatus::SUCCESS);
 
   // Navigate to a search results page.
-  content::WindowedNotificationObserver observer(
-      chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
-      content::NotificationService::AllSources());
   SetOmniboxText("flowers");
   PressEnterAndWaitForNavigation();
-  observer.Wait();
 
   // Set the fake response for suggest request. Response has no prefetch
   // details. Ensure that the page received a blank query to clear the
   // prefetched results.
   fake_factory()->SetFakeResponse(
       instant_url().Resolve("#q=dogs"),
       "[\"dogs\",[\"https://dogs.com\"],[],[],"
           "{\"google:suggesttype\":[\"NAVIGATION\"],"
           "\"google:suggestrelevance\":[2]}]",
       net::HTTP_OK,
@@ skipping 10 matching lines @@
 
   ASSERT_EQ(2, CountSearchProviderSuggestions());
   ASSERT_FALSE(SearchProvider::ShouldPrefetch(*(
       omnibox()->model()->result().default_match())));
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(UpdateSearchState(active_tab));
   ASSERT_EQ("", prefetch_query_value_);
 }
 
-#if defined(OS_LINUX) && defined(ADDRESS_SANITIZER)
-// Flaky timeouts at shutdown on Linux ASan; http://crbug.com/505478.
-#define MAYBE_ShowURL DISABLED_ShowURL
-#else
-#define MAYBE_ShowURL ShowURL
-#endif
-IN_PROC_BROWSER_TEST_F(InstantExtendedTest, MAYBE_ShowURL) {
-  ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  FocusOmnibox();
-
-  // Create an observer to wait for the instant tab to support Instant.
-  content::WindowedNotificationObserver observer(
-      chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
-      content::NotificationService::AllSources());
-
-  // Do a search and commit it.  The omnibox should show the search terms.
-  SetOmniboxText("foo");
-  EXPECT_EQ(ASCIIToUTF16("foo"), omnibox()->GetText());
-  browser()->window()->GetLocationBar()->AcceptInput();
-  observer.Wait();
-  EXPECT_FALSE(omnibox()->model()->user_input_in_progress());
-  EXPECT_TRUE(browser()->toolbar_model()->WouldPerformSearchTermReplacement(
-      false));
-  EXPECT_EQ(ASCIIToUTF16("foo"), omnibox()->GetText());
-
-  // Calling ShowURL() should disable search term replacement and show the URL.
-  omnibox()->ShowURL();
-  EXPECT_FALSE(browser()->toolbar_model()->WouldPerformSearchTermReplacement(
-      false));
-  // Don't bother looking for a specific URL; ensuring we're no longer showing
-  // the search terms is sufficient.
-  EXPECT_NE(ASCIIToUTF16("foo"), omnibox()->GetText());
-}
-
 // Check that clicking on a result sends the correct referrer.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, Referrer) {
   ASSERT_TRUE(embedded_test_server()->Start());
   GURL result_url = embedded_test_server()->GetURL(
       "/referrer_policy/referrer-policy-log.html");
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmnibox();
 
   // Type a query and press enter to get results.
   SetOmniboxText("query");
   PressEnterAndWaitForFrameLoad();
 
   // Simulate going to a result.
   content::WebContents* contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   std::ostringstream stream;
   stream << "var link = document.createElement('a');";
   stream << "link.href = \"" << result_url.spec() << "\";";
   stream << "document.body.appendChild(link);";
   stream << "link.click();";
   EXPECT_TRUE(content::ExecuteScript(contents, stream.str()));
 
   content::WaitForLoadStop(contents);
   std::string expected_title =
       "Referrer is " + instant_url().GetWithEmptyPath().spec();
   EXPECT_EQ(ASCIIToUTF16(expected_title), contents->GetTitle());
 }