Change event routers from singletons to being owned by the ExtensionService.

chrome/browser/extensions/extension_preference_api.cc

 // Copyright (c) 2011 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/extensions/extension_preference_api.h"
 
 #include <map>
 
 #include "base/json/json_writer.h"
 #include "base/memory/singleton.h"
@@ skipping 181 matching lines @@
   std::map<std::string, PrefTransformerInterface*> transformers_;
 
   scoped_ptr<PrefTransformerInterface> identity_transformer_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefMapping);
 };
 
 }  // namespace
 
 ExtensionPreferenceEventRouter::ExtensionPreferenceEventRouter(
-    Profile* profile) : profile_(profile) {
+    Profile* profile)  : profile_(profile) {

[asargent_no_longer_on_chrome, 2011/05/24 19:53:31]

did you mean to include this extra space be here?

[Yoyo Zhou, 2011/05/25 00:48:47]

Nope, thanks.

+}
+
+ExtensionPreferenceEventRouter::~ExtensionPreferenceEventRouter() {}
+
+void ExtensionPreferenceEventRouter::Init() {
   registrar_.Init(profile_->GetPrefs());
   incognito_registrar_.Init(profile_->GetOffTheRecordPrefs());
   for (size_t i = 0; i < arraysize(kPrefMapping); ++i) {
     registrar_.Add(kPrefMapping[i].browser_pref, this);
     incognito_registrar_.Add(kPrefMapping[i].browser_pref, this);
   }
 }
 
-ExtensionPreferenceEventRouter::~ExtensionPreferenceEventRouter() { }
-
 void ExtensionPreferenceEventRouter::Observe(
     NotificationType type,
     const NotificationSource& source,
     const NotificationDetails& details) {
   if (type == NotificationType::PREF_CHANGED) {
     const std::string* pref_key =
         Details<const std::string>(details).ptr();
     OnPrefChanged(Source<PrefService>(source).ptr(), *pref_key);
   } else {
     NOTREACHED();
@@ skipping 184 matching lines @@
       PrefMapping::GetInstance()->FindBrowserPrefForExtensionPref(
           pref_key, &browser_pref, &permission));
   if (!GetExtension()->HasApiPermission(permission)) {
     error_ = base::StringPrintf(kPermissionErrorMessage, pref_key.c_str());
     return false;
   }
   ExtensionPrefs* prefs = profile_->GetExtensionService()->extension_prefs();
   prefs->RemoveExtensionControlledPref(extension_id(), browser_pref, incognito);
   return true;
 }