Split ExtensionSystem interface from ExtensionSystemImpl implementation, part 1.

chrome/browser/extensions/extension_host.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/extension_host.h"
 
 #include <list>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/error_console/error_console.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/extension_web_contents_observer.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_error.h"
+#include "extensions/browser/extension_system.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/browser/runtime_data.h"
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_urls.h"
 #include "extensions/common/feature_switch.h"
 #include "extensions/common/manifest_handlers/background_info.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/window_open_disposition.h"
@@ skipping 144 matching lines @@
   LoadInitialURL();
   if (!IsBackgroundPage()) {
     DCHECK(IsRenderViewLive());
     ExtensionService* service = GetExtensionService();
     if (service)
       service->DidCreateRenderViewForBackgroundPage(this);
   }
 }
 
 ExtensionService* ExtensionHost::GetExtensionService() {
-  return ExtensionSystem::GetForBrowserContext(browser_context_)
-      ->extension_service();
+  return ExtensionSystem::Get(browser_context_)->extension_service();
 }
 
 const GURL& ExtensionHost::GetURL() const {
   return host_contents()->GetURL();
 }
 
 void ExtensionHost::LoadInitialURL() {
   host_contents_->GetController().LoadURL(
       initial_url_, content::Referrer(), content::PAGE_TRANSITION_LINK,
       std::string());
@@ skipping 99 matching lines @@
   // If the document has already been marked as available for this host, then
   // bail. No need for the redundant setup. http://crbug.com/31170
   if (document_element_available_)
     return;
   document_element_available_ = true;
   OnDocumentAvailable();
 }
 
 void ExtensionHost::OnDocumentAvailable() {
   DCHECK(extension_host_type_ == VIEW_TYPE_EXTENSION_BACKGROUND_PAGE);
-  ExtensionSystem::GetForBrowserContext(browser_context_)
+  ExtensionSystem::Get(browser_context_)
       ->runtime_data()
       ->SetBackgroundPageReady(extension_, true);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_BACKGROUND_PAGE_READY,
       content::Source<const Extension>(extension_),
       content::NotificationService::NoDetails());
 }
 
 void ExtensionHost::CloseContents(WebContents* contents) {
   Close();
@@ skipping 13 matching lines @@
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void ExtensionHost::OnRequest(const ExtensionHostMsg_Request_Params& params) {
   extension_function_dispatcher_.Dispatch(params, render_view_host());
 }
 
 void ExtensionHost::OnEventAck() {
-  EventRouter* router =
-      ExtensionSystem::GetForBrowserContext(browser_context_)->event_router();
+  EventRouter* router = ExtensionSystem::Get(browser_context_)->event_router();
   if (router)
     router->OnEventAck(browser_context_, extension_id());
 }
 
 void ExtensionHost::OnIncrementLazyKeepaliveCount() {
-  ProcessManager* pm = ExtensionSystem::GetForBrowserContext(
+  ProcessManager* pm = ExtensionSystem::Get(
       browser_context_)->process_manager();
   if (pm)
     pm->IncrementLazyKeepaliveCount(extension());
 }
 
 void ExtensionHost::OnDecrementLazyKeepaliveCount() {
-  ProcessManager* pm = ExtensionSystem::GetForBrowserContext(
+  ProcessManager* pm = ExtensionSystem::Get(
       browser_context_)->process_manager();
   if (pm)
     pm->DecrementLazyKeepaliveCount(extension());
 }
 
 void ExtensionHost::OnDetailedConsoleMessageAdded(
     const base::string16& message,
     const base::string16& source,
     const StackTrace& stack_trace,
     int32 severity_level) {
   if (!IsSourceFromAnExtension(source))
     return;
 
   GURL context_url;
   WebContents* associated_contents = GetAssociatedWebContents();
   if (associated_contents)
     context_url = associated_contents->GetLastCommittedURL();
   else if (host_contents_.get())
     context_url = host_contents_->GetLastCommittedURL();
 
   ErrorConsole* console =
-      ExtensionSystem::GetForBrowserContext(browser_context_)->error_console();
+      ExtensionSystem::Get(browser_context_)->error_console();
   if (!console)
     return;
 
   console->ReportError(
       scoped_ptr<ExtensionError>(new RuntimeError(
           extension_id_,
           browser_context_->IsOffTheRecord(),
           source,
           message,
           stack_trace,
@@ skipping 63 matching lines @@
 
 void ExtensionHost::RequestMediaAccessPermission(
     content::WebContents* web_contents,
     const content::MediaStreamRequest& request,
     const content::MediaResponseCallback& callback) {
   MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
       web_contents, request, callback, extension());
 }
 
 }  // namespace extensions