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

chrome/browser/search/instant_unittest_base.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/search/instant_unittest_base.h"
 #include <string>
 
 #include "base/basictypes.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/google/google_url_tracker.h"
@@ skipping 26 matching lines @@
   SetUpHelper();
 }
 
 void InstantUnitTestBase::SetUpWithoutCacheableNTP() {
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
       "InstantExtended", "Group1 use_cacheable_ntp:0"));
   SetUpHelper();
 }
 
 void InstantUnitTestBase::SetUpHelper() {
-  chrome::EnableInstantExtendedAPIForTesting();
+  chrome::EnableQueryExtractionForTesting();
   BrowserWithTestWindowTest::SetUp();
 
   TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
       profile(), &TemplateURLServiceFactory::BuildInstanceFor);
   template_url_service_ = TemplateURLServiceFactory::GetForProfile(profile());
   ui_test_utils::WaitForTemplateURLServiceToLoad(template_url_service_);
 
   UIThreadSearchTermsData::SetGoogleBaseURL("https://www.google.com/");
   TestingPrefServiceSyncable* pref_service = profile()->GetTestingPrefService();
   pref_service->SetUserPref(prefs::kLastPromptedGoogleURL,
@@ skipping 38 matching lines @@
       content::Source<Profile>(profile()->GetOriginalProfile()),
       content::Details<GoogleURLTracker::UpdatedDetails>(&details));
 }
 
 
 bool InstantUnitTestBase::IsInstantServiceObserver(
     InstantServiceObserver* observer) {
   return instant_service_->observers_.HasObserver(observer);
 }