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

chrome/browser/ui/search/instant_extended_interactive_uitest.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 <sstream>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
@@ skipping 130 matching lines @@
         on_native_suggestions_calls_(0),
         on_change_calls_(0),
         submit_count_(0),
         on_esc_key_press_event_calls_(0),
         on_focus_changed_calls_(0),
         is_focused_(false),
         on_toggle_voice_search_calls_(0) {
   }
  protected:
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    chrome::EnableInstantExtendedAPIForTesting();
+    chrome::EnableQueryExtractionForTesting();
     ASSERT_TRUE(https_test_server().Start());
     GURL instant_url = https_test_server().GetURL(
         "files/instant_extended.html?strk=1&");
     InstantTestBase::Init(instant_url, false);
   }
 
   int64 GetHistogramCount(const char* name) {
     base::HistogramBase* histogram =
         base::StatisticsRecorder::FindHistogram(name);
     if (!histogram) {
@@ skipping 105 matching lines @@
 };
 
 class InstantExtendedPrefetchTest : public InstantExtendedTest {
  public:
   InstantExtendedPrefetchTest()
       : factory_(new net::URLFetcherImplFactory()),
         fake_factory_(new net::FakeURLFetcherFactory(factory_.get())) {
   }
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    chrome::EnableInstantExtendedAPIForTesting();
+    chrome::EnableQueryExtractionForTesting();
     ASSERT_TRUE(https_test_server().Start());
     GURL instant_url = https_test_server().GetURL(
         "files/instant_extended.html?strk=1&");
     InstantTestBase::Init(instant_url, true);
   }
 
   net::FakeURLFetcherFactory* fake_factory() { return fake_factory_.get(); }
 
  private:
   // Used to instantiate FakeURLFetcherFactory.
@@ skipping 30 matching lines @@
 
 // Test class used to verify chrome-search: scheme and access policy from the
 // Instant overlay.  This is a subclass of |ExtensionBrowserTest| because it
 // loads a theme that provides a background image.
 class InstantPolicyTest : public ExtensionBrowserTest, public InstantTestBase {
  public:
   InstantPolicyTest() {}
 
  protected:
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    chrome::EnableInstantExtendedAPIForTesting();
     ASSERT_TRUE(https_test_server().Start());
     GURL instant_url = https_test_server().GetURL(
         "files/instant_extended.html?strk=1&");
     InstantTestBase::Init(instant_url, false);
   }
 
   void InstallThemeSource() {
     ThemeSource* theme = new ThemeSource(profile());
     content::URLDataSource::Add(profile(), theme);
   }
@@ skipping 692 matching lines @@
   stream << "link.href = \"" << result_url.spec() << "\";";
   stream << "document.body.appendChild(link);";
   stream << "link.click();";
   EXPECT_TRUE(content::ExecuteScript(contents, stream.str()));
 
   content::WaitForLoadStop(contents);
   std::string expected_title =
       "Referrer is " + instant_url().GetWithEmptyPath().spec();
   EXPECT_EQ(ASCIIToUTF16(expected_title), contents->GetTitle());
 }