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

chrome/browser/ui/search/search_model_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_model.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/ui/search/search_model_observer.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 56 matching lines @@
 class SearchModelTest : public ChromeRenderViewHostTestHarness {
  public:
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
   MockSearchModelObserver mock_observer;
   SearchModel* model;
 };
 
 void SearchModelTest::SetUp() {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableInstantExtendedAPI);
   ChromeRenderViewHostTestHarness::SetUp();
   SearchTabHelper::CreateForWebContents(web_contents());
   SearchTabHelper* search_tab_helper =
       SearchTabHelper::FromWebContents(web_contents());
   ASSERT_TRUE(search_tab_helper != NULL);
   model = search_tab_helper->model();
   model->AddObserver(&mock_observer);
 }
 
 void SearchModelTest::TearDown() {
@@ skipping 61 matching lines @@
 
   SearchModel::State expected_old_state = model->state();
   SearchModel::State expected_new_state(model->state());
   expected_new_state.voice_search_supported = true;
 
   model->SetVoiceSearchSupported(true);
   mock_observer.VerifySearchModelStates(expected_old_state, expected_new_state);
   mock_observer.VerifyNotificationCount(1);
   EXPECT_TRUE(model->voice_search_supported());
 }