Remove GetExtensionEventRouter from Profile.

chrome/browser/extensions/settings/settings_test_util.cc

 // 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.
 
 #include "chrome/browser/extensions/settings/settings_test_util.h"
 
 #include "base/file_path.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/extensions/settings/settings_frontend.h"
 
 namespace extensions {
 
 namespace settings_test_util {
 
 // Intended as a StorageCallback from GetStorage.
 static void AssignStorage(ValueStore** dst, ValueStore* src) {
   *dst = src;
 }
@@ skipping 79 matching lines @@
   DCHECK(extension.get());
   DCHECK(error.empty());
   extensions_[id] = extension;
 
   for (std::set<std::string>::const_iterator it = permissions_set.begin();
       it != permissions_set.end(); ++it) {
     DCHECK(extension->HasAPIPermission(*it));
   }
 }
 
+// MockExtensionSystem
+
+MockExtensionSystem::MockExtensionSystem(Profile* profile)
+      : TestExtensionSystem(profile) {}
+MockExtensionSystem::~MockExtensionSystem() {}
+
+EventRouter* MockExtensionSystem::event_router() {
+  if (!event_router_.get())
+    event_router_.reset(new EventRouter(profile_, NULL));
+  return event_router_.get();
+}
+
+ProfileKeyedService* BuildMockExtensionSystem(Profile* profile) {
+  return new MockExtensionSystem(profile);
+}
+
 // MockProfile
 
 MockProfile::MockProfile(const FilePath& file_path)
     : TestingProfile(file_path) {
-  event_router_.reset(new EventRouter(this, NULL));
+  ExtensionSystemFactory::GetInstance()->SetTestingFactoryAndUse(this,
+      &BuildMockExtensionSystem);
 }
 
 MockProfile::~MockProfile() {}
 
 MockExtensionService* MockProfile::GetMockExtensionService() {
   return &extension_service_;
 }
 
 ExtensionService* MockProfile::GetExtensionService() {
   ExtensionServiceInterface* as_interface =
       static_cast<ExtensionServiceInterface*>(&extension_service_);
   return static_cast<ExtensionService*>(as_interface);
 }
 
-EventRouter* MockProfile::GetExtensionEventRouter() {
-  return event_router_.get();
-}
-
 // ScopedSettingsFactory
 
 ScopedSettingsStorageFactory::ScopedSettingsStorageFactory() {}
 
 ScopedSettingsStorageFactory::ScopedSettingsStorageFactory(
     const scoped_refptr<SettingsStorageFactory>& delegate)
     : delegate_(delegate) {}
 
 ScopedSettingsStorageFactory::~ScopedSettingsStorageFactory() {}
 
 void ScopedSettingsStorageFactory::Reset(
     const scoped_refptr<SettingsStorageFactory>& delegate) {
   delegate_ = delegate;
 }
 
 ValueStore* ScopedSettingsStorageFactory::Create(
     const FilePath& base_path, const std::string& extension_id) {
   DCHECK(delegate_.get());
   return delegate_->Create(base_path, extension_id);
 }
 
 }  // namespace settings_test_util
 
 }  // namespace extensions