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

chrome/browser/browser.h

 // 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.
 
 #ifndef CHROME_BROWSER_BROWSER_H_
 #define CHROME_BROWSER_BROWSER_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 1071 matching lines @@
 
   // Dialog box used for opening and saving files.
   scoped_refptr<SelectFileDialog> select_file_dialog_;
 
   // Keep track of the encoding auto detect pref.
   BooleanPrefMember encoding_auto_detect_;
 
   // Keep track of the printing enabled pref.
   BooleanPrefMember printing_enabled_;
 
-  // Keep track of when instant enabled changes.
-  BooleanPrefMember instant_enabled_;
-
   // Indicates if command execution is blocked.
   bool block_command_execution_;
 
   // Stores the last blocked command id when |block_command_execution_| is true.
   int last_blocked_command_id_;
 
   // Stores the disposition type of the last blocked command.
   WindowOpenDisposition last_blocked_command_disposition_;
 
   // Different types of action when web app info is available.
@@ skipping 17 matching lines @@
   // The profile's tab restore service. The service is owned by the profile,
   // and we install ourselves as an observer.
   TabRestoreService* tab_restore_service_;
 
   scoped_ptr<InstantController> instant_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 #endif  // CHROME_BROWSER_BROWSER_H_