Revert 72153 - Remove user-related data from local_state and add to user_pre...

chrome/browser/ui/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_UI_BROWSER_H_
 #define CHROME_BROWSER_UI_BROWSER_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 941 matching lines @@
   void FindInPage(bool find_next, bool forward_direction);
 
   // Closes the frame.
   // TODO(beng): figure out if we need this now that the frame itself closes
   //             after a return to the message loop.
   void CloseFrame();
 
   void TabDetachedAtImpl(TabContentsWrapper* contents,
       int index, DetachType type);
 
-  // Create a preference dictionary for the provided application name, in the
-  // given user profile. This is done only once per application name / per
-  // session / per user profile.
-  static void RegisterAppPrefs(const std::string& app_name, Profile* profile);
+  // Create a preference dictionary for the provided application name. This is
+  // done only once per application name / per session.
+  static void RegisterAppPrefs(const std::string& app_name);
 
   // Shared code between Reload() and ReloadIgnoringCache().
   void ReloadInternal(WindowOpenDisposition disposition, bool ignore_cache);
 
   // Return true if the window dispositions means opening a new tab.
   bool ShouldOpenNewTabForWindowDisposition(WindowOpenDisposition disposition);
 
   // Depending on the disposition, return the current tab or a clone of the
   // current tab.
   TabContents* GetOrCloneTabForDisposition(WindowOpenDisposition disposition);
@@ skipping 163 matching lines @@
   // and we install ourselves as an observer.
   TabRestoreService* tab_restore_service_;
 
   scoped_ptr<InstantController> instant_;
   scoped_ptr<InstantUnloadHandler> instant_unload_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_H_