InstantExtended: remove old flags, add new flag for query extraction.

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 593 matching lines @@
       .WillOnce(testing::Return(false));
 
   GetSearchIPCRouter().SetPromoInformation(false);
   EXPECT_FALSE(MessageWasSent(ChromeViewMsg_SearchBoxPromoInformation::ID));
 }
 
 TEST_F(SearchIPCRouterTest,
        SendSetDisplayInstantResultsMsg_EnableInstantOnResultsPage) {
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
       "EmbeddedSearch",
-      "Group1 espv:42 suppress_on_srp:0 prefetch_results_srp:1"));
+      "Group1 espv:42 query_extraction:1 prefetch_results_srp:1"));
   NavigateAndCommitActiveTab(GURL("https://foo.com/url?espv&bar=abc"));
 
   // 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) {
@@ skipping 151 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));
 }