Remove GetExtensionService from Profile.

chrome/browser/extensions/event_router.cc

Index: chrome/browser/extensions/event_router.cc
diff --git a/chrome/browser/extensions/event_router.cc b/chrome/browser/extensions/event_router.cc
index 213299b2f6c879663028f330231dd5427f0243b5..f61a8774609912b656339632e68b23d08e785a61 100644
--- a/chrome/browser/extensions/event_router.cc
+++ b/chrome/browser/extensions/event_router.cc
@@ -232,8 +232,8 @@ void EventRouter::AddLazyEventListener(const std::string& event_name,
   bool is_new = listeners_.AddListener(listener.Pass());
 
   if (is_new) {
-    ExtensionPrefs* prefs =
-        profile_->GetExtensionService()->extension_prefs();
+    ExtensionPrefs* prefs = extensions::ExtensionSystem::Get(profile_)->
+        extension_service()->extension_prefs();
     std::set<std::string> events = prefs->GetRegisteredEvents(extension_id);
     bool prefs_is_new = events.insert(event_name).second;
     if (prefs_is_new)
@@ -248,8 +248,8 @@ void EventRouter::RemoveLazyEventListener(const std::string& event_name,
   bool did_exist = listeners_.RemoveListener(&listener);
 
   if (did_exist) {
-    ExtensionPrefs* prefs =
-        profile_->GetExtensionService()->extension_prefs();
+    ExtensionPrefs* prefs = extensions::ExtensionSystem::Get(profile_)->
+        extension_service()->extension_prefs();
     std::set<std::string> events = prefs->GetRegisteredEvents(extension_id);
     bool prefs_did_exist = events.erase(event_name) > 0;
     DCHECK(prefs_did_exist);
@@ -272,8 +272,8 @@ void EventRouter::AddFilteredEventListener(const std::string& event_name,
         scoped_ptr<DictionaryValue>(filter.DeepCopy()))));
 
     if (added) {
-      ExtensionPrefs* prefs =
-          profile_->GetExtensionService()->extension_prefs();
+      ExtensionPrefs* prefs = extensions::ExtensionSystem::Get(profile_)->
+          extension_service()->extension_prefs();
       prefs->AddFilterToEvent(event_name, extension_id, &filter);
     }
   }
@@ -295,8 +295,8 @@ void EventRouter::RemoveFilteredEventListener(
     bool removed = listeners_.RemoveListener(&listener);
 
     if (removed) {
-      ExtensionPrefs* prefs =
-          profile_->GetExtensionService()->extension_prefs();
+      ExtensionPrefs* prefs = extensions::ExtensionSystem::Get(profile_)->
+          extension_service()->extension_prefs();
       prefs->RemoveFilterFromEvent(event_name, extension_id, &filter);
     }
   }
@@ -450,7 +450,8 @@ void EventRouter::DispatchLazyEvent(
     const std::string& extension_id,
     const linked_ptr<Event>& event,
     std::set<EventDispatchIdentifier>* already_dispatched) {
-  ExtensionService* service = profile_->GetExtensionService();
+  ExtensionService* service =
+      extensions::ExtensionSystem::Get(profile_)->extension_service();
   // Check both the original and the incognito profile to see if we
   // should load a lazy bg page to handle the event. The latter case
   // occurs in the case of split-mode extensions.
@@ -475,7 +476,8 @@ void EventRouter::DispatchLazyEvent(
 void EventRouter::DispatchEventToProcess(const std::string& extension_id,
                                          content::RenderProcessHost* process,
                                          const linked_ptr<Event>& event) {
-  ExtensionService* service = profile_->GetExtensionService();
+  ExtensionService* service =
+      extensions::ExtensionSystem::Get(profile_)->extension_service();
   const Extension* extension = service->extensions()->GetByID(extension_id);
 
   // The extension could have been removed, but we do not unregister it until
@@ -485,8 +487,8 @@ void EventRouter::DispatchEventToProcess(const std::string& extension_id,
 
   Profile* listener_profile = Profile::FromBrowserContext(
       process->GetBrowserContext());
-  ProcessMap* process_map =
-      listener_profile->GetExtensionService()->process_map();
+  ProcessMap* process_map = extensions::ExtensionSystem::Get(listener_profile)->
+      extension_service()->process_map();
   // If the event is privileged, only send to extension processes. Otherwise,
   // it's OK to send to normal renderers (e.g., for content scripts).
   if (ExtensionAPI::GetSharedInstance()->IsPrivileged(event->event_name) &&
@@ -519,7 +521,8 @@ bool EventRouter::CanDispatchEventToProfile(Profile* profile,
   bool cross_incognito =
       event->restrict_to_profile && profile != event->restrict_to_profile;
   if (cross_incognito &&
-      !profile->GetExtensionService()->CanCrossIncognito(extension)) {
+      !extensions::ExtensionSystem::Get(profile)->extension_service()->
+          CanCrossIncognito(extension)) {
     if (!event->cross_incognito_args.get())
       return false;
     // Send the event with different arguments to extensions that can't
@@ -610,8 +613,8 @@ void EventRouter::Observe(int type,
       // Add all registered lazy listeners to our cache.
       const Extension* extension =
           content::Details<const Extension>(details).ptr();
-      ExtensionPrefs* prefs =
-          profile_->GetExtensionService()->extension_prefs();
+      ExtensionPrefs* prefs = extensions::ExtensionSystem::Get(profile_)->
+          extension_service()->extension_prefs();
       std::set<std::string> registered_events =
           prefs->GetRegisteredEvents(extension->id());
       listeners_.LoadUnfilteredLazyListeners(extension->id(),