Split ExtensionSystem interface from ExtensionSystemImpl implementation, part 1.

extensions/browser/event_router.cc

Index: extensions/browser/event_router.cc
diff --git a/extensions/browser/event_router.cc b/extensions/browser/event_router.cc
index fa3530450f390bfd8f84b4e3ec8d5e5fc864a8ac..c710da30b56f45293df38fd4682b3849becc5b12 100644
--- a/extensions/browser/event_router.cc
+++ b/extensions/browser/event_router.cc
@@ -13,13 +13,13 @@
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_host.h"
-#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
+#include "extensions/browser/extension_system.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/browser/lazy_background_task_queue.h"
 #include "extensions/browser/process_manager.h"
@@ -82,7 +82,7 @@ void EventRouter::NotifyExtensionDispatchObserverOnUIThread(
     if (!ExtensionsBrowserClient::Get()->IsValidContext(context))
       return;
     ExtensionSystem* extension_system =
-        ExtensionSystem::GetForBrowserContext(context);
+        ExtensionSystem::Get(context);

[James Cook, 2014/01/28 23:40:57]

Can this be rewrapped?

[Yoyo Zhou, 2014/01/29 00:42:56]

Done.

     EventRouter* event_router = extension_system->event_router();
     if (!event_router)
       return;
@@ -574,7 +574,7 @@ bool EventRouter::MaybeLoadLazyBackgroundPageToDispatchEvent(
     // Most events can only be dispatched to ephemeral apps that are already
     // running.
     ProcessManager* pm =
-        ExtensionSystem::GetForBrowserContext(context)->process_manager();
+        ExtensionSystem::Get(context)->process_manager();

[James Cook, 2014/01/28 23:40:57]

ditto?

There might be a way to run clang-format just on the lines affected by the
patch. git cl format?

     if (!pm->GetBackgroundHostForExtension(extension->id()))
       return false;
   }
@@ -582,7 +582,7 @@ bool EventRouter::MaybeLoadLazyBackgroundPageToDispatchEvent(
   if (!CanDispatchEventToBrowserContext(context, extension, event))
     return false;
 
-  LazyBackgroundTaskQueue* queue = ExtensionSystem::GetForBrowserContext(
+  LazyBackgroundTaskQueue* queue = ExtensionSystem::Get(
       context)->lazy_background_task_queue();
   if (queue->ShouldEnqueueTask(context, extension)) {
     linked_ptr<Event> dispatched_event(event);
@@ -617,7 +617,7 @@ void EventRouter::IncrementInFlightEventsOnUI(
   if (!ExtensionsBrowserClient::Get()->IsValidContext(browser_context))
     return;
   ExtensionSystem* extension_system =
-      ExtensionSystem::GetForBrowserContext(browser_context);
+      ExtensionSystem::Get(browser_context);
   EventRouter* event_router = extension_system->event_router();
   if (!event_router)
     return;
@@ -635,7 +635,7 @@ void EventRouter::IncrementInFlightEvents(BrowserContext* context,
   // because that's the only time we'll get an ACK.
   if (BackgroundInfo::HasLazyBackgroundPage(extension)) {
     ProcessManager* pm =
-        ExtensionSystem::GetForBrowserContext(context)->process_manager();
+        ExtensionSystem::Get(context)->process_manager();
     ExtensionHost* host = pm->GetBackgroundHostForExtension(extension->id());
     if (host)
       pm->IncrementLazyKeepaliveCount(extension);
@@ -645,7 +645,7 @@ void EventRouter::IncrementInFlightEvents(BrowserContext* context,
 void EventRouter::OnEventAck(BrowserContext* context,
                              const std::string& extension_id) {
   ProcessManager* pm =
-      ExtensionSystem::GetForBrowserContext(context)->process_manager();
+      ExtensionSystem::Get(context)->process_manager();
   ExtensionHost* host = pm->GetBackgroundHostForExtension(extension_id);
   // The event ACK is routed to the background host, so this should never be
   // NULL.
@@ -687,7 +687,7 @@ void EventRouter::Observe(int type,
       const Extension* extension =
           content::Details<const Extension>(details).ptr();
       if (BackgroundInfo::HasLazyBackgroundPage(extension)) {
-        LazyBackgroundTaskQueue* queue = ExtensionSystem::GetForBrowserContext(
+        LazyBackgroundTaskQueue* queue = ExtensionSystem::Get(
             browser_context_)->lazy_background_task_queue();
         queue->AddPendingTask(browser_context_, extension->id(),
                               base::Bind(&DoNothing));