Remove unused / unnecessary stuff from Instant.

chrome/browser/ui/views/search/search_view_controller_browsertest.cc

 // Copyright (c) 2012 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/search/search_view_controller.h"
 
 #include "base/command_line.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/instant/instant_controller.h"
-#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/search/search.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/browser/ui/search/search_model_observer.h"
 #include "chrome/browser/ui/search/search_types.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/contents_container.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 
 // Currently, the features under test are only enabled under Aura.
 #if defined(USE_AURA)
 #define MAYBE(x) x
 #else
 #define MAYBE(x) DISABLED_##x
 #endif
 
@@ skipping 175 matching lines @@
   // Expect that the |contents_container_| has the overlay set, but no preview.
   ASSERT_TRUE(controller_contents_has_overlay());
   EXPECT_TRUE(controller_contents_overlay_visible());
   EXPECT_FALSE(controller_contents_has_preview());
 }
 
 IN_PROC_BROWSER_TEST_F(SearchViewControllerTest,
                        MAYBE(NTPToInstantSuggestions)) {
   AVOID_TEST_ON_BRANDED_CHROME();
 
-  PrefService* service = browser()->profile()->GetPrefs();
-  service->SetBoolean(prefs::kInstantEnabled, true);
   EXPECT_TRUE(InstantController::IsInstantEnabled(browser()->profile()));
 
   // Initial state.
   EXPECT_TRUE(browser()->search_model()->mode().is_default());
   ASSERT_NE(static_cast<SearchViewController*>(NULL), controller());
 
   // Get to NTP.
   AddTabAtIndex(0, GURL("chrome://newtab"), content::PAGE_TRANSITION_LINK);
   EXPECT_TRUE(browser()->search_model()->mode().is_ntp());
   EXPECT_TRUE(controller_state_is_ntp());
@@ skipping 14 matching lines @@
   // Expect that the |ntp_container_| layer is hidden.
   EXPECT_FALSE(controller_ntp_container_is_visible());
 
   // Expect that the |contents_container_| overlay exists.
   ASSERT_TRUE(controller_contents_has_overlay());
   EXPECT_TRUE(controller_contents_overlay_visible());
 }
 
 }  // namespace search
 }  // namespace chrome