Enable prefetch-search-results on Desktop Chrome by default.

chrome/browser/search/search_unittest.cc

 // Copyright (c) 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 "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/prefs/pref_service.h"
@@ skipping 653 matching lines @@
   // query portion of the instant URL.
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kExtraSearchQueryParams, "a=b");
   instant_url = GetInstantURL(profile(), kDisableStartMargin, false);
   ASSERT_TRUE(instant_url.is_valid());
   EXPECT_EQ("http://www.bar.com/webhp?a=b&strk", instant_url.spec());
 }
 
 TEST_F(SearchTest, ShouldPrefetchSearchResults_InstantExtendedAPIEnabled) {
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
-      "EmbeddedSearch",
-      "Group1 espv:2 prefetch_results:1"));
+      "EmbeddedSearch", "Group1 espv:2"));
+#if defined(OS_IOS)
+  EXPECT_EQ(1ul, EmbeddedSearchPageVersion());
   EXPECT_TRUE(ShouldPrefetchSearchResults());
-#if defined(OS_IOS) || defined(OS_ANDROID)
-  EXPECT_EQ(1ul, EmbeddedSearchPageVersion());
 #else
   EXPECT_EQ(2ul, EmbeddedSearchPageVersion());
+  EXPECT_TRUE(ShouldPrefetchSearchResults());
 #endif
 }
 
-TEST_F(SearchTest, ShouldPrefetchSearchResults_DisabledViaFieldTrial) {
-  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
-      "EmbeddedSearch",
-      "Group1 espv:89 prefetch_results:0"));
+TEST_F(SearchTest, ShouldPrefetchSearchResults_Default) {
+#if defined(OS_IOS)
   EXPECT_FALSE(ShouldPrefetchSearchResults());
-  EXPECT_EQ(89ul, EmbeddedSearchPageVersion());
+#else
+  EXPECT_TRUE(ShouldPrefetchSearchResults());
+#endif
 }
 
-TEST_F(SearchTest, ShouldPrefetchSearchResults_EnabledViaFieldTrial) {
-  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
-      "EmbeddedSearch",
-      "Group1 espv:80 prefetch_results:1"));
-  EXPECT_TRUE(ShouldPrefetchSearchResults());
-  EXPECT_EQ(80ul, EmbeddedSearchPageVersion());
-}
-
-TEST_F(SearchTest, ShouldPrefetchSearchResults_EnabledViaCommandLine) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kPrefetchSearchResults);
-  // Command-line enable should override Finch.
-  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
-      "EmbeddedSearch", "Group1 espv:80 prefetch_results:0"));
-  EXPECT_TRUE(ShouldPrefetchSearchResults());
-  EXPECT_EQ(80ul, EmbeddedSearchPageVersion());
-}
-
-TEST_F(SearchTest,
-       ShouldAllowPrefetchNonDefaultMatch_PrefetchResultsFlagDisabled) {
-  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
-      "EmbeddedSearch",
-      "Group1 espv:80 prefetch_results:0 allow_prefetch_non_default_match:1"));
-  EXPECT_FALSE(ShouldAllowPrefetchNonDefaultMatch());
-  EXPECT_EQ(80ul, EmbeddedSearchPageVersion());
+TEST_F(SearchTest, ShouldReuseInstantSearchBasePage_Default) {
+#if defined(OS_IOS)
+  EXPECT_FALSE(ShouldReuseInstantSearchBasePage());
+#else
+  EXPECT_TRUE(ShouldReuseInstantSearchBasePage());
+#endif
 }
 
 TEST_F(SearchTest, ShouldAllowPrefetchNonDefaultMatch_DisabledViaFieldTrial) {
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
-      "EmbeddedSearch",
-      "Group1 espv:89 prefetch_results:1 allow_prefetch_non_default_match:0"));
+      "EmbeddedSearch", "Group1 espv:89 allow_prefetch_non_default_match:0"));
   EXPECT_FALSE(ShouldAllowPrefetchNonDefaultMatch());
   EXPECT_EQ(89ul, EmbeddedSearchPageVersion());
 }
 
 TEST_F(SearchTest, ShouldAllowPrefetchNonDefaultMatch_EnabledViaFieldTrial) {
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
-      "EmbeddedSearch",
-      "Group1 espv:80 prefetch_results:1 allow_prefetch_non_default_match:1"));
+      "EmbeddedSearch", "Group1 espv:80 allow_prefetch_non_default_match:1"));
   EXPECT_TRUE(ShouldAllowPrefetchNonDefaultMatch());
   EXPECT_EQ(80ul, EmbeddedSearchPageVersion());
 }
 
 TEST_F(SearchTest, ShouldUseAltInstantURL_DisabledViaFieldTrial) {
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
       "EmbeddedSearch", "Group1 espv:8 use_alternate_instant_url:0"));
   EXPECT_FALSE(ShouldUseAltInstantURL());
 }
 
 TEST_F(SearchTest, ShouldUseAltInstantURL_EnabledViaFieldTrial) {
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
       "EmbeddedSearch", "Group1 espv:8 use_alternate_instant_url:1"));
   EXPECT_TRUE(ShouldUseAltInstantURL());
 }
 
 TEST_F(SearchTest,
-       ShouldPrerenderInstantUrlOnOmniboxFocus_PrefetchResultsFlagDisabled) {
-  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
-      "EmbeddedSearch",
-      "Group1 espv:80 prefetch_results:0 "
-      "prerender_instant_url_on_omnibox_focus:1"));
-  EXPECT_FALSE(ShouldPrerenderInstantUrlOnOmniboxFocus());
-  EXPECT_EQ(80ul, EmbeddedSearchPageVersion());
-}
-
-TEST_F(SearchTest,
        ShouldPrerenderInstantUrlOnOmniboxFocus_DisabledViaFieldTrial) {
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
       "EmbeddedSearch",
-      "Group1 espv:89 prefetch_results:1 "
-      "prerender_instant_url_on_omnibox_focus:0"));
+      "Group1 espv:89 prerender_instant_url_on_omnibox_focus:0"));
   EXPECT_FALSE(ShouldPrerenderInstantUrlOnOmniboxFocus());
   EXPECT_EQ(89ul, EmbeddedSearchPageVersion());
 }
 
 TEST_F(SearchTest,
        ShouldPrerenderInstantUrlOnOmniboxFocus_EnabledViaFieldTrial) {
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
       "EmbeddedSearch",
-      "Group1 espv:80 prefetch_results:1 "
-      "prerender_instant_url_on_omnibox_focus:1"));
+      "Group1 espv:80 prerender_instant_url_on_omnibox_focus:1"));
   EXPECT_TRUE(ShouldPrerenderInstantUrlOnOmniboxFocus());
   EXPECT_EQ(80ul, EmbeddedSearchPageVersion());
 }
 
-TEST_F(SearchTest,
-       ShouldReuseInstantSearchBasePage_PrefetchResultsFlagDisabled) {
-  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
-      "EmbeddedSearch",
-      "Group1 espv:89 prefetch_results:0 reuse_instant_search_base_page:1"));
-  EXPECT_FALSE(ShouldPrefetchSearchResults());
-  EXPECT_FALSE(ShouldReuseInstantSearchBasePage());
-  EXPECT_EQ(89ul, EmbeddedSearchPageVersion());
-}
 
-TEST_F(SearchTest, ShouldReuseInstantSearchBasePage_EnabledViaFieldTrial) {
-  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
-      "EmbeddedSearch",
-      "Group1 espv:89 prefetch_results:1 reuse_instant_search_base_page:1"));
-  EXPECT_TRUE(ShouldReuseInstantSearchBasePage());
-  EXPECT_EQ(89ul, EmbeddedSearchPageVersion());
-}
-
-TEST_F(SearchTest, ShouldReuseInstantSearchBasePage_DisabledViaFieldTrial) {
-  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
-      "EmbeddedSearch",
-      "Group1 espv:89 prefetch_results:1 reuse_instant_search_base_page:0"));
-  EXPECT_FALSE(ShouldReuseInstantSearchBasePage());
-  EXPECT_EQ(89ul, EmbeddedSearchPageVersion());
-}
 
 TEST_F(SearchTest, ShouldShowGoogleLocalNTP_Default) {
   EXPECT_TRUE(ShouldShowGoogleLocalNTP());
 }
 
 TEST_F(SearchTest, ShouldShowGoogleLocalNTP_EnabledViaFinch) {
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
       "EmbeddedSearch", "Group1 espv:2 google_local_ntp:1"));
   EXPECT_TRUE(ShouldShowGoogleLocalNTP());
 }
 
 TEST_F(SearchTest, ShouldShowGoogleLocalNTP_DisabledViaFinch) {
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
       "EmbeddedSearch", "Group1 espv:2 google_local_ntp:0"));
   EXPECT_FALSE(ShouldShowGoogleLocalNTP());
 }
 
-TEST_F(SearchTest, ShouldReuseInstantSearchBasePage_EnabledViaCommandLine) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kPrefetchSearchResults);
-  // Command-line enable should override Finch.
-  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
-      "EmbeddedSearch",
-      "Group1 espv:89 prefetch_results:0 reuse_instant_search_base_page:1"));
-  EXPECT_TRUE(ShouldPrefetchSearchResults());
-  EXPECT_TRUE(ShouldReuseInstantSearchBasePage());
-  EXPECT_EQ(89ul, EmbeddedSearchPageVersion());
-}
 
 TEST_F(SearchTest, IsNTPURL) {
   GURL invalid_url;
   GURL ntp_url(chrome::kChromeUINewTabURL);
   GURL local_ntp_url(GetLocalInstantURL(profile()));
 
   EXPECT_FALSE(chrome::IsNTPURL(invalid_url, profile()));
   // No margin.
   EnableQueryExtractionForTesting();
   profile()->GetPrefs()->SetBoolean(prefs::kSearchSuggestEnabled, true);
@@ skipping 15 matching lines @@
 }
 
 TEST_F(SearchTest, GetSearchURLs) {
   std::vector<GURL> search_urls = GetSearchURLs(profile());
   EXPECT_EQ(2U, search_urls.size());
   EXPECT_EQ("http://foo.com/alt#quux=", search_urls[0].spec());
   EXPECT_EQ("http://foo.com/url?bar=", search_urls[1].spec());
 }
 
 TEST_F(SearchTest, GetSearchResultPrefetchBaseURL) {
-  // "prefetch_results" flag is disabled.
+#if defined(OS_IOS)
+  EXPECT_FALSE(ShouldPrefetchSearchResults());
   EXPECT_EQ(GURL(), GetSearchResultPrefetchBaseURL(profile()));
-
-  // "prefetch_results" flag is enabled via field trials.
-  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
-      "EmbeddedSearch",
-      "Group1 espv:80 prefetch_results:1"));
+#else
   EXPECT_TRUE(ShouldPrefetchSearchResults());
-
   EXPECT_EQ(GURL("https://foo.com/instant?ion=1&foo=foo#foo=foo&strk"),
             GetSearchResultPrefetchBaseURL(profile()));
+#endif
 }
 
 TEST_F(SearchTest, ForceInstantResultsParam) {
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("EmbeddedSearch",
                                                      "Group1 espv:2"));
   EXPECT_TRUE(IsInstantExtendedAPIEnabled());
   EXPECT_EQ("ion=1&", ForceInstantResultsParam(true));
   EXPECT_EQ(std::string(), ForceInstantResultsParam(false));
 }
 
@@ skipping 91 matching lines @@
   EXPECT_EQ("http://www.google.com/search?q=foo", result.spec());
 }
 
 typedef SearchTest InstantExtendedEnabledParamTest;
 
 TEST_F(InstantExtendedEnabledParamTest, QueryExtractionDisabled) {
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("EmbeddedSearch",
                                                      "Group1 espv:12"));
   // Make sure InstantExtendedEnabledParam() returns an empty string for search
   // requests.
-#if defined(OS_IOS) || defined(OS_ANDROID)
+#if defined(OS_IOS)
   // Query extraction is always enabled on mobile.
   EXPECT_TRUE(IsQueryExtractionEnabled());
   EXPECT_EQ("espv=12&", InstantExtendedEnabledParam(true));
 #else
   EXPECT_FALSE(IsQueryExtractionEnabled());
   EXPECT_EQ("", InstantExtendedEnabledParam(true));
 #endif
   EXPECT_EQ("espv=12&", InstantExtendedEnabledParam(false));
 }
 
 TEST_F(InstantExtendedEnabledParamTest, QueryExtractionEnabled) {
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
       "EmbeddedSearch", "Group1 espv:10 query_extraction:1"));
   EXPECT_TRUE(IsQueryExtractionEnabled());
   // Make sure InstantExtendedEnabledParam() returns a non-empty param string
   // for search requests.
   EXPECT_EQ("espv=10&", InstantExtendedEnabledParam(true));
   EXPECT_EQ("espv=10&", InstantExtendedEnabledParam(false));
 }
 
 TEST_F(InstantExtendedEnabledParamTest, UseDefaultEmbeddedSearchPageVersion) {
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
       "EmbeddedSearch", "Group1 espv:-1 query_extraction:1"));
   EXPECT_TRUE(IsQueryExtractionEnabled());
-#if defined(OS_IOS) || defined(OS_ANDROID)
+#if defined(OS_IOS)
   EXPECT_EQ("espv=1&", InstantExtendedEnabledParam(true));
   EXPECT_EQ("espv=1&", InstantExtendedEnabledParam(false));
 #else
   EXPECT_EQ("espv=2&", InstantExtendedEnabledParam(true));
   EXPECT_EQ("espv=2&", InstantExtendedEnabledParam(false));
 #endif
 }
 
 typedef SearchTest IsQueryExtractionEnabledTest;
 
@@ skipping 190 matching lines @@
 }
 
 TEST_F(OriginChipTest, CommandLineOnSrp) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableOriginChipOnSrp);
   EXPECT_TRUE(ShouldDisplayOriginChip());
   EXPECT_EQ(ORIGIN_CHIP_ON_SRP, GetOriginChipCondition());
 }
 
 }  // namespace chrome