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

chrome/browser/ui/search/search_ipc_router_unittest.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 "chrome/browser/ui/search/search_ipc_router.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 662 matching lines @@
   // Make sure ChromeViewMsg_SearchBoxSetDisplayInstantResults message param is
   // set to true if the underlying page is a results page and
   // "prefetch_results_srp" flag is enabled via field trials.
   VerifyDisplayInstantResultsMsg(true);
 }
 
 TEST_F(SearchIPCRouterTest,
        SendSetDisplayInstantResultsMsg_DisableInstantOnResultsPage) {
   // |prefetch_results_srp" flag is disabled via field trials.
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
-      "EmbeddedSearch", "Group1 espv:42 prefetch_results_srp:0"));
+      "EmbeddedSearch",
+      "Group1 espv:42 query_extraction:1 prefetch_results_srp:0"));
   NavigateAndCommitActiveTab(GURL("https://foo.com/url?espv&bar=abc"));
 
   // Make sure ChromeViewMsg_SearchBoxSetDisplayInstantResults message param is
   // set to false.
   VerifyDisplayInstantResultsMsg(false);
 }
 
 TEST_F(SearchIPCRouterTest,
-       SendSetDisplayInstantResultsMsg_DisableInstantOutsideResultsPage) {
-  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
-      "EmbeddedSearch", "Group1 espv:42 prefetch_results_srp:1"));
+       SendSetDisplayInstantResultsMsg_EnableInstantOutsideSearchResultsPage) {
   NavigateAndCommitActiveTab(GURL(chrome::kChromeSearchLocalNtpUrl));
-
   // Make sure ChromeViewMsg_SearchBoxSetDisplayInstantResults param is set to
-  // false if the underlying page is not a search results page.
-  VerifyDisplayInstantResultsMsg(false);
-}
-
-TEST_F(SearchIPCRouterTest,
-       SendSetDisplayInstantResultsMsg_InstantSearchEnabled) {
-  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
-      "EmbeddedSearch",
-      "Group1 espv:42 prefetch_results:1 use_cacheable_ntp:1"));
-  NavigateAndCommitActiveTab(GURL(chrome::kChromeSearchLocalNtpUrl));
-
-  // If the "prefetch_results" flag is enabled via field trials, then
-  // ChromeViewMsg_SearchBoxSetDisplayInstantResults message param is set to
-  // true irrespective of the underlying page.
+  // true if the underlying page is not a search results page.
   VerifyDisplayInstantResultsMsg(true);
 }
 
-TEST_F(SearchIPCRouterTest,
-       SendSetDisplayInstantResultsMsg_InstantSearchDisabled) {
-  ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
-      "EmbeddedSearch",
-      "Group1 espv:42 use_cacheable_ntp:1 prefetch_results:0"));
-  NavigateAndCommitActiveTab(GURL(chrome::kChromeSearchLocalNtpUrl));
-
-  // Make sure ChromeViewMsg_SearchBoxSetDisplayInstantResults param is set to
-  // false if the "prefetch_results" flag is disabled via field trials.
-  VerifyDisplayInstantResultsMsg(false);
-}
-
 TEST_F(SearchIPCRouterTest, DoNotSendSetDisplayInstantResultsMsg) {
   NavigateAndCommitActiveTab(GURL("chrome-search://foo/bar"));
   SetupMockDelegateAndPolicy();
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
   EXPECT_CALL(*policy, ShouldSendSetDisplayInstantResults()).Times(1)
       .WillOnce(testing::Return(false));
 
   process()->sink().ClearMessages();
   GetSearchIPCRouter().SetDisplayInstantResults();
   EXPECT_FALSE(MessageWasSent(
@@ skipping 194 matching lines @@
   NavigateAndCommitActiveTab(GURL("chrome-search://foo/bar"));
   SetupMockDelegateAndPolicy();
   MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
   EXPECT_CALL(*policy, ShouldSendToggleVoiceSearch()).Times(1)
       .WillOnce(testing::Return(false));
 
   process()->sink().ClearMessages();
   GetSearchIPCRouter().ToggleVoiceSearch();
   EXPECT_FALSE(MessageWasSent(ChromeViewMsg_SearchBoxToggleVoiceSearch::ID));
 }