Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/profiles/profile_impl.h

 // 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.
 
 // This class gathers state related to a single user profile.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/public/pref_change_registrar.h"
 #include "base/timer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_impl_io_data.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class NetPrefObserver;
 class PrefService;
+class PrefServiceBase;
 class PromoResourceService;
 class SSLConfigServiceManager;
 
 #if defined(OS_CHROMEOS)
 namespace chromeos {
 class EnterpriseExtensionObserver;
 class LocaleChangeGuard;
 class Preferences;
 }
 #endif
 
 namespace base {
 class SequencedTaskRunner;
 }
 
 namespace content {
 class SpeechRecognitionPreferences;
 }
 
 namespace extensions {
 class ExtensionSystem;
 }
 
 // The default profile implementation.
 class ProfileImpl : public Profile,
-                    public content::NotificationObserver {
+                    public content::NotificationObserver,
+                    public PrefObserver {
  public:
   // Value written to prefs when the exit type is EXIT_NORMAL. Public for tests.
   static const char* const kPrefExitTypeNormal;
 
   virtual ~ProfileImpl();
 
   static void RegisterUserPrefs(PrefService* prefs);
 
   // content::BrowserContext implementation:
   virtual FilePath GetPath() OVERRIDE;
@@ skipping 63 matching lines @@
   virtual void InitChromeOSPreferences() OVERRIDE;
 #endif  // defined(OS_CHROMEOS)
 
   virtual PrefProxyConfigTracker* GetProxyConfigTracker() OVERRIDE;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
+  // PrefObserver implementation.
+  virtual void OnPreferenceChanged(PrefServiceBase* service,
+                                   const std::string& pref_name) OVERRIDE;
+
+  // PrefInitObserver implementation.

[Mattias Nissler (ping if slow), 2012/10/31 13:29:36]

Comment misplaced :)

[Jói, 2012/10/31 14:56:26]

Done.

+
  private:
   friend class Profile;
   FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest,
                            ProfilesLaunchedAfterCrash);
   FRIEND_TEST_ALL_PREFIXES(ProfileBrowserTest, ProfileReadmeCreated);
   FRIEND_TEST_ALL_PREFIXES(ProfileBrowserTest,
                            ProfileDeletedBeforeReadmeCreated);
 
   // Delay, in milliseconds, before README file is created for a new profile.
   // This is non-const for testing purposes.
   static int create_readme_delay_ms;
 
   ProfileImpl(const FilePath& path,
               Delegate* delegate,
               CreateMode create_mode,
               base::SequencedTaskRunner* sequenced_task_runner);
 
   // Does final initialization. Should be called after prefs were loaded.
   void DoFinalInit(bool is_new_profile);
 
   void InitHostZoomMap();
 
+  void OnInitializationCompleted(PrefServiceBase* pref_service,
+                                 bool succeeded);
+
   // Does final prefs initialization and calls Init().
   void OnPrefsLoaded(bool success);
 
   FilePath GetPrefFilePath();
 
 #if defined(ENABLE_SESSION_SERVICE)
   void StopCreateSessionServiceTimer();
 
   void EnsureSessionServiceCreated();
 #endif
@@ skipping 96 matching lines @@
   //   chrome/browser/profile/profile_keyed_dependency_manager.{h,cc}
 
   Profile::Delegate* delegate_;
 
   chrome_browser_net::Predictor* predictor_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileImpl);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_