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

chrome/browser/ui/search/search_tab_helper_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_tab_helper.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/signin/fake_signin_manager.h"
@@ skipping 32 matching lines @@
   MOCK_METHOD1(OnLogEvent, void(NTPLoggingEventType event));
   MOCK_METHOD1(PasteIntoOmnibox, void(const string16&));
   MOCK_METHOD1(OnChromeIdentityCheck, void(const string16& identity));
 };
 
 }  // namespace
 
 class SearchTabHelperTest : public ChromeRenderViewHostTestHarness {
  public:
   virtual void SetUp() {
-    CommandLine::ForCurrentProcess()->AppendSwitch(
-        switches::kEnableInstantExtendedAPI);
     ChromeRenderViewHostTestHarness::SetUp();
     SearchTabHelper::CreateForWebContents(web_contents());
   }
 
   // Creates a sign-in manager for tests.  If |username| is not empty, the
   // testing profile of the WebContents will be connected to the given account.
   void CreateSigninManager(const std::string& username) {
     SigninManagerBase* signin_manager = static_cast<SigninManagerBase*>(
         SigninManagerFactory::GetInstance()->SetTestingFactoryAndUse(
             profile(), FakeSigninManagerBase::Build));
@@ skipping 135 matching lines @@
 
   const IPC::Message* message = process()->sink().GetUniqueMessageMatching(
       ChromeViewMsg_ChromeIdentityCheckResult::ID);
   ASSERT_TRUE(message != NULL);
 
   ChromeViewMsg_ChromeIdentityCheckResult::Param params;
   ChromeViewMsg_ChromeIdentityCheckResult::Read(message, &params);
   EXPECT_EQ(test_identity, params.a);
   ASSERT_FALSE(params.b);
 }