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

chrome/browser/ui/search/search_ipc_router_policy_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 "build/build_config.h"
 #include "base/command_line.h"
 #include "chrome/browser/ui/search/search_ipc_router_policy_impl.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 class SearchIPCRouterPolicyTest : public BrowserWithTestWindowTest {
  public:
   virtual void SetUp() {
-    CommandLine::ForCurrentProcess()->AppendSwitch(
-        switches::kEnableInstantExtendedAPI);
     BrowserWithTestWindowTest::SetUp();
     AddTab(browser(), GURL("chrome://blank"));
     SearchTabHelper::CreateForWebContents(web_contents());
   }
 
   SearchTabHelper* GetSearchTabHelper() {
     SearchTabHelper* search_tab_helper =
         SearchTabHelper::FromWebContents(web_contents());
     EXPECT_NE(static_cast<SearchTabHelper*>(NULL), search_tab_helper);
     return search_tab_helper;
@@ skipping 219 matching lines @@
       ShouldSendThemeBackgroundInfo());
 }
 
 TEST_F(SearchIPCRouterPolicyTest, SubmitQuery) {
   NavigateAndCommitActiveTab(GURL("chrome-search://foo/bar"));
   SearchTabHelper* search_tab_helper =
       SearchTabHelper::FromWebContents(web_contents());
   ASSERT_NE(static_cast<SearchTabHelper*>(NULL), search_tab_helper);
   EXPECT_TRUE(search_tab_helper->ipc_router().policy()->ShouldSubmitQuery());
 }