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

chrome/browser/browser.cc

Index: chrome/browser/browser.cc
===================================================================
--- chrome/browser/browser.cc	(revision 62881)
+++ chrome/browser/browser.cc	(working copy)
@@ -240,7 +240,6 @@
   encoding_auto_detect_.Init(prefs::kWebKitUsesUniversalDetector,
                              profile_->GetPrefs(), NULL);
   use_vertical_tabs_.Init(prefs::kUseVerticalTabs, profile_->GetPrefs(), this);
-  instant_enabled_.Init(prefs::kInstantEnabled, profile_->GetPrefs(), this);
   if (!TabMenuModel::AreVerticalTabsEnabled()) {
     // If vertical tabs aren't enabled, explicitly turn them off. Otherwise we
     // might show vertical tabs but not show an option to turn them off.
@@ -3308,15 +3307,6 @@
         UseVerticalTabsChanged();
       } else if (pref_name == prefs::kPrintingEnabled) {
         UpdatePrintingState(0);
-      } else if (pref_name == prefs::kInstantEnabled) {
-        if (!InstantController::IsEnabled(profile())) {
-          if (instant()) {
-            instant()->DestroyPreviewContents();
-            instant_.reset(NULL);
-          }
-        } else {
-          CreateInstantIfNecessary();
-        }
       } else {
         NOTREACHED();
       }
@@ -4246,7 +4236,7 @@
 }
 
 void Browser::CreateInstantIfNecessary() {
-  if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) &&
+  if (type() == TYPE_NORMAL && InstantController::IsEnabled() &&
       !profile()->IsOffTheRecord()) {
     instant_.reset(new InstantController(this));
   }