Split ExtensionSystem interface from ExtensionSystemImpl implementation, part 1.

This moves ExtensionSystem to extensions/browser.
It also moves setting the channel for Features to ChromeExtensionsBrowserClient.
It also removes the duplicate ExtensionSystem::GetForBrowserContext.

BUG=337707
TBR=sky@chromium.org

Review URL: https://codereview.chromium.org/147923005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247788 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 9 insertions, 7 deletions

diff --git a/apps/app_load_service.cc b/apps/app_load_service.cc
index 071f95e..a64cffc 100644
--- a/apps/app_load_service.cc
+++ b/apps/app_load_service.cc
@@ -10,13 +10,13 @@
 #include "chrome/browser/chrome_notification_types.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/unpacked_installer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "extensions/browser/extension_prefs.h"
+#include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 
 using extensions::Extension;
@@ -54,7 +54,7 @@ bool AppLoadService::LoadAndLaunch(const base::FilePath& extension_path,
                                    const CommandLine& command_line,
                                    const base::FilePath& current_dir) {
   ExtensionService* extension_service =
-      ExtensionSystem::GetForBrowserContext(profile_)->extension_service();
+      ExtensionSystem::Get(profile_)->extension_service();
   std::string extension_id;
   if (!extensions::UnpackedInstaller::Create(extension_service)->
           LoadFromCommandLine(base::FilePath(extension_path), &extension_id)) {
diff --git a/apps/launcher.cc b/apps/launcher.cc
index 3733da7..599f5f9 100644
--- a/apps/launcher.cc
+++ b/apps/launcher.cc
@@ -16,7 +16,6 @@
 #include "chrome/browser/extensions/api/file_handlers/app_file_handler_util.h"
 #include "chrome/browser/extensions/api/file_system/file_system_api.h"
 #include "chrome/browser/extensions/extension_host.h"
-#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/app_runtime.h"
 #include "chrome/common/extensions/extension_messages.h"
@@ -25,6 +24,7 @@
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_prefs.h"
+#include "extensions/browser/extension_system.h"
 #include "extensions/browser/lazy_background_task_queue.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/common/extension.h"
diff --git a/apps/saved_files_service.cc b/apps/saved_files_service.cc
index 346ca4c..f6050d7 100644
--- a/apps/saved_files_service.cc
+++ b/apps/saved_files_service.cc
@@ -15,6 +15,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/extension_prefs.h"
+#include "extensions/browser/extension_system.h"
 #include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/permissions/permission_set.h"
 
diff --git a/apps/saved_files_service_unittest.cc b/apps/saved_files_service_unittest.cc
index ebe94c1..f6add9c 100644
--- a/apps/saved_files_service_unittest.cc
+++ b/apps/saved_files_service_unittest.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/extensions/test_extension_environment.h"
 #include "chrome/test/base/testing_profile.h"
 #include "extensions/browser/extension_prefs.h"
+#include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/apps/shell/shell_browser_main_parts.cc b/apps/shell/shell_browser_main_parts.cc
index c8dd2a1..e10c857 100644
--- a/apps/shell/shell_browser_main_parts.cc
+++ b/apps/shell/shell_browser_main_parts.cc
@@ -13,10 +13,10 @@
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
-#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/common/chrome_paths.h"
 #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
 #include "content/public/common/result_codes.h"
+#include "extensions/browser/extension_system.h"
 #include "extensions/browser/renderer_startup_helper.h"
 #include "extensions/common/extension_paths.h"
 #include "ui/aura/env.h"
@@ -170,7 +170,7 @@ void ShellBrowserMainParts::DestroyRootWindow() {
 void ShellBrowserMainParts::CreateExtensionSystem() {
   DCHECK(browser_context_);
   extension_system_ = static_cast<ShellExtensionSystem*>(
-      ExtensionSystem::GetForBrowserContext(browser_context_.get()));
+      ExtensionSystem::Get(browser_context_.get()));
   extension_system_->InitForRegularProfile(true);
 }
 
diff --git a/apps/shell/shell_extension_system.h b/apps/shell/shell_extension_system.h
index e970944..62dd752 100644
--- a/apps/shell/shell_extension_system.h
+++ b/apps/shell/shell_extension_system.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/compiler_specific.h"
-#include "chrome/browser/extensions/extension_system.h"
+#include "extensions/browser/extension_system.h"
 #include "extensions/common/one_shot_event.h"
 
 class BrowserContextKeyedServiceFactory;
diff --git a/apps/shell_window.cc b/apps/shell_window.cc
index 9fef5c4..9c0247a 100644
--- a/apps/shell_window.cc
+++ b/apps/shell_window.cc
@@ -12,7 +12,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_web_contents_observer.h"
 #include "chrome/browser/extensions/suggest_permission_util.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
@@ -32,6 +31,7 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/media_stream_request.h"
+#include "extensions/browser/extension_system.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/common/extension.h"