Split ExtensionSystem interface from ExtensionSystemImpl implementation, part 1.

chrome/browser/chrome_content_browser_client.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/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 18 matching lines @@
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
 #include "chrome/browser/extensions/browser_permissions_policy_delegate.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/extensions/extension_webkit_preferences.h"
 #include "chrome/browser/extensions/suggest_permission_util.h"
 #include "chrome/browser/geolocation/chrome_access_token_store.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/guestview/adview/adview_guest.h"
 #include "chrome/browser/guestview/guestview.h"
 #include "chrome/browser/guestview/guestview_constants.h"
 #include "chrome/browser/guestview/webview/webview_guest.h"
 #include "chrome/browser/local_discovery/storage/privet_filesystem_backend.h"
@@ skipping 68 matching lines @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/child_process_host.h"
 #include "content/public/common/content_descriptors.h"
 #include "content/public/common/url_utils.h"
 #include "extensions/browser/extension_registry.h"
+#include "extensions/browser/extension_system.h"
 #include "extensions/browser/info_map.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/browser/process_map.h"
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/manifest_handlers/background_info.h"
 #include "extensions/common/manifest_handlers/shared_module_info.h"
 #include "extensions/common/manifest_handlers/web_accessible_resources_info.h"
@@ skipping 1205 matching lines @@
   extensions::ExtensionRegistry* extension_registry =
       extensions::ExtensionRegistry::Get(site_instance->GetBrowserContext());
   if (!extension_registry)
     return;
   const Extension* extension =
       extension_registry->enabled_extensions().GetExtensionOrAppByURL(
         site_instance->GetSiteURL());
   if (!extension)
     return;
   extensions::ExtensionSystem* extension_system =
-      extensions::ExtensionSystem::GetForBrowserContext(
-          site_instance->GetBrowserContext());
+      extensions::ExtensionSystem::Get(site_instance->GetBrowserContext());
   extension_system->info_map()->RegisterExtensionWorkerProcess(
       extension->id(),
       worker_process_id,
       site_instance->GetId());
 }
 
 void ChromeContentBrowserClient::WorkerProcessTerminated(
     SiteInstance* site_instance,
     int worker_process_id) {
   extensions::ExtensionSystem* extension_system =
-      extensions::ExtensionSystem::GetForBrowserContext(
-          site_instance->GetBrowserContext());
+      extensions::ExtensionSystem::Get(site_instance->GetBrowserContext());
   extension_system->info_map()->UnregisterExtensionWorkerProcess(
       worker_process_id);
 }
 
 bool ChromeContentBrowserClient::ShouldSwapBrowsingInstancesForNavigation(
     SiteInstance* site_instance,
     const GURL& current_url,
     const GURL& new_url) {
   // If we don't have an ExtensionService, then rely on the SiteInstance logic
   // in RenderFrameHostManager to decide when to swap.
@@ skipping 1326 matching lines @@
   // releases of Chrome. Permitting "Unknown" allows these APIs to be used on
   // Chromium builds as well.
   return channel <= chrome::VersionInfo::CHANNEL_DEV;
 #else
   return false;
 #endif
 }
 
 
 }  // namespace chrome