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

chrome/browser/ui/views/bookmarks/bookmark_bar_view_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 "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/bookmarks/bookmark_test_helpers.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/app_list/app_list_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/scoped_testing_local_state.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "ui/views/controls/button/text_button.h"
 
 class BookmarkBarViewInstantExtendedTest : public BrowserWithTestWindowTest {
  public:
   BookmarkBarViewInstantExtendedTest() {
-    chrome::EnableInstantExtendedAPIForTesting();
   }
 
  protected:
   virtual TestingProfile* CreateProfile() OVERRIDE {
     TestingProfile* profile = BrowserWithTestWindowTest::CreateProfile();
     // TemplateURLService is normally NULL during testing. Instant extended
     // needs this service so set a custom factory function.
     TemplateURLServiceFactory::GetInstance()->SetTestingFactory(
         profile, &BookmarkBarViewInstantExtendedTest::CreateTemplateURLService);
     return profile;
@@ skipping 28 matching lines @@
     EXPECT_FALSE(bookmark_bar_view.apps_page_shortcut_->visible());
   } else {
     EXPECT_TRUE(bookmark_bar_view.apps_page_shortcut_->visible());
   }
 
   // Make sure we can also properly transition from true to false.
   browser()->profile()->GetPrefs()->SetBoolean(
       prefs::kShowAppsShortcutInBookmarkBar, false);
   EXPECT_FALSE(bookmark_bar_view.apps_page_shortcut_->visible());
 }