Merge 62881 - Moves instant back into flags....

chrome/browser/instant/instant_controller.cc

 // Copyright (c) 2010 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/instant/instant_controller.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/instant/instant_delegate.h"
 #include "chrome/browser/instant/instant_loader.h"
@@ skipping 10 matching lines @@
 // Number of ms to delay between loading urls.
 static const int kUpdateDelayMS = 200;
 
 // static
 void InstantController::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kInstantConfirmDialogShown, false);
   prefs->RegisterBooleanPref(prefs::kInstantEnabled, false);
 }
 
 // static
-bool InstantController::IsEnabled(Profile* profile) {
+bool InstantController::IsEnabled() {
+  // TODO: convert to kInstantEnabled once pref lands.
   static bool enabled = false;
   static bool checked = false;
   if (!checked) {
     checked = true;
     enabled = CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kEnableMatchPreview);
   }
-  PrefService* prefs = profile->GetPrefs();
-  return (enabled || (prefs && prefs->GetBoolean(prefs::kInstantEnabled)));
+  return enabled;
 }
 
 InstantController::InstantController(InstantDelegate* delegate)
     : delegate_(delegate),
       tab_contents_(NULL),
       is_active_(false),
       commit_on_mouse_up_(false),
       last_transition_type_(PageTransition::LINK) {
 }
 
@@ skipping 269 matching lines @@
     template_url = model ? model->GetDefaultSearchProvider() : NULL;
   }
   if (template_url && template_url->id() &&
       template_url->instant_url() &&
       !IsBlacklistedFromInstant(template_url->id()) &&
       template_url->instant_url()->SupportsReplacement()) {
     return template_url;
   }
   return NULL;
 }