Allow non default prefetch suggestions to be prefetched

chrome/browser/search/search_unittest.cc

Index: chrome/browser/search/search_unittest.cc
diff --git a/chrome/browser/search/search_unittest.cc b/chrome/browser/search/search_unittest.cc
index 543ec009b05b228637c22a1aff8df677fa5a8276..ee753e87b6e4246525ef2ffad17adb269cbf77bc 100644
--- a/chrome/browser/search/search_unittest.cc
+++ b/chrome/browser/search/search_unittest.cc
@@ -689,6 +689,44 @@ TEST_F(SearchTest, ShouldPrefetchSearchResults_EnabledViaFieldTrial) {
   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"));

[kmadhusu, 2014/06/18 17:07:38]

style nit: This can fit in the previous line.

[sidharthms, 2014/06/18 22:45:22]

Done.

+  EXPECT_FALSE(ShouldAllowPrefetchNonDefaultMatch());
+  EXPECT_EQ(80ul, EmbeddedSearchPageVersion());
+}
+
+TEST_F(SearchTest, ShouldAllowPrefetchNonDefaultMatch_DisabledViaFieldTrial) {
+  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
+      "EmbeddedSearch",
+      "Group1 espv:89 prefetch_results:1 "
+      "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"));
+  EXPECT_TRUE(ShouldAllowPrefetchNonDefaultMatch());
+  EXPECT_EQ(80ul, EmbeddedSearchPageVersion());
+}
+
 TEST_F(SearchTest,
        ShouldPrerenderInstantUrlOnOmniboxFocus_PrefetchResultsFlagDisabled) {
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
@@ -719,17 +757,6 @@ TEST_F(SearchTest,
   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,
        ShouldReuseInstantSearchBasePage_PrefetchResultsFlagDisabled) {
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(