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

chrome/browser/ui/omnibox/omnibox_controller_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/prefs/pref_service.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
-#include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/omnibox/omnibox_controller.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class OmniboxControllerTest : public testing::Test {
  protected:
   OmniboxControllerTest();
   virtual ~OmniboxControllerTest();
 
@@ skipping 47 matching lines @@
   const ACProviders* providers = GetAutocompleteProviders();
   for (size_t i = 0; i < providers->size(); ++i)
     observed_providers |= providers->at(i)->type();
   // Ensure we have at least one provider.
   ASSERT_NE(0, observed_providers);
 
   // Ensure instant extended includes all the provides in classic Chrome.
   int providers_with_instant_extended = observed_providers;
   // TODO(beaudoin): remove TYPE_SEARCH once it's no longer needed to pass
   // the Instant suggestion through via FinalizeInstantQuery.
-  chrome::EnableInstantExtendedAPIForTesting();
   CreateController();
   AssertProviders(providers_with_instant_extended);
 }