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

chrome/browser/ui/search/instant_ntp_prerenderer_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 "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/search/instant_ntp.h"
@@ skipping 107 matching lines @@
   std::string test_instant_url_;
   bool override_javascript_enabled_;
   bool test_javascript_enabled_;
   bool test_in_startup_;
   InstantNTP* test_ntp_;
 };
 
 class InstantNTPPrerendererTest : public testing::Test {
  public:
   virtual void SetUp() OVERRIDE {
-    chrome::EnableInstantExtendedAPIForTesting();
     instant_service_ = InstantServiceFactory::GetForProfile(&profile_);
     instant_ntp_prerenderer_.reset(
         new TestableInstantNTPPrerenderer(&profile_, instant_service_));
   }
 
   virtual void TearDown() OVERRIDE {
     instant_ntp_prerenderer_.reset();
   }
 
   TestableInstantNTPPrerenderer* instant_ntp_prerenderer() {
@@ skipping 98 matching lines @@
 
 TEST_F(InstantNTPPrerendererTest, IsJavascriptEnabledChecksPrefs) {
   instant_ntp_prerenderer()->set_override_javascript_enabled(false);
   instant_ntp_prerenderer()->profile()->GetPrefs()->SetBoolean(
       prefs::kWebKitJavascriptEnabled, true);
   EXPECT_TRUE(instant_ntp_prerenderer()->IsJavascriptEnabled());
   instant_ntp_prerenderer()->profile()->GetPrefs()->SetBoolean(
       prefs::kWebKitJavascriptEnabled, false);
   EXPECT_FALSE(instant_ntp_prerenderer()->IsJavascriptEnabled());
 }