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

chrome/browser/ui/search/instant_extended_manual_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 "base/strings/string_util.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/task_manager/task_manager.h"
@@ skipping 54 matching lines @@
     disable_network_change_notifier_.reset(
         new net::NetworkChangeNotifier::DisableForTest());
   }
 
   virtual void CleanUpOnMainThread() OVERRIDE {
     disable_network_change_notifier_.reset();
   }
 
  protected:
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    chrome::EnableInstantExtendedAPIForTesting();
+    chrome::EnableQueryExtractionForTesting();
   }
 
   content::WebContents* active_tab() {
     return browser()->tab_strip_model()->GetActiveWebContents();
   }
 
   bool IsGooglePage(content::WebContents* contents) {
     bool is_google = false;
     if (!GetBoolFromJS(contents, "!!window.google", &is_google))
       return false;
@@ skipping 78 matching lines @@
   // The omnibox should say "test" and have visible focus.
   EXPECT_EQ("test", GetOmniboxText());
   EXPECT_EQ(OMNIBOX_FOCUS_VISIBLE, omnibox()->model()->focus_state());
 
   // Pressing enter should search for [test].
   const string16& search_title = ASCIIToUTF16("test - Google Search");
   content::TitleWatcher title_watcher(active_tab, search_title);
   PressEnterAndWaitForNavigation();
   EXPECT_EQ(search_title, title_watcher.WaitAndGetTitle());
 }