Moved some more dependencies of ExtensionService to extensions

This change also removed a few includes from extension_service.cc that
were not in use.

Dependencies moved in this CL:
pending_extension_info
pending_extension_manager

TBR=sky
BUG=298537

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

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

chrome/browser/extensions/extension_service.cc

@@ -29,9 +29,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/app_runtime/app_runtime_api.h"
-#include "chrome/browser/extensions/api/declarative/rules_registry_service.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
-#include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
 #include "chrome/browser/extensions/api/runtime/runtime_api.h"
 #include "chrome/browser/extensions/api/storage/settings_frontend.h"
 #include "chrome/browser/extensions/component_loader.h"
@@ -45,24 +43,20 @@
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "chrome/browser/extensions/extension_sync_service.h"
 #include "chrome/browser/extensions/extension_system.h"
-#include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/external_install_ui.h"
 #include "chrome/browser/extensions/external_provider_impl.h"
 #include "chrome/browser/extensions/install_verifier.h"
 #include "chrome/browser/extensions/installed_loader.h"
-#include "chrome/browser/extensions/pending_extension_manager.h"
 #include "chrome/browser/extensions/permissions_updater.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/extensions/update_observer.h"
 #include "chrome/browser/extensions/updater/extension_updater.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/ntp/thumbnail_source.h"
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/chrome_version_info.h"
 #include "chrome/common/crash_keys.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_file_util.h"
@@ -87,6 +81,7 @@
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/browser/external_provider_interface.h"
 #include "extensions/browser/management_policy.h"
+#include "extensions/browser/pending_extension_manager.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/error_utils.h"

chrome/browser/extensions/extension_service.h

@@ -22,8 +22,6 @@
 #include "chrome/browser/extensions/extension_function_histogram_value.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_sync_service.h"
-#include "chrome/browser/extensions/pending_enables.h"
-#include "chrome/browser/extensions/pending_extension_manager.h"
 #include "chrome/browser/extensions/update_observer.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_set.h"
@@ -32,6 +30,7 @@
 #include "content/public/browser/notification_registrar.h"
 #include "extensions/browser/external_provider_interface.h"
 #include "extensions/browser/management_policy.h"
+#include "extensions/browser/pending_extension_manager.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/browser/process_map.h"
 #include "extensions/browser/quota_service.h"

chrome/browser/extensions/extension_service_unittest.cc

@@ -56,8 +56,6 @@
 #include "chrome/browser/extensions/install_tracker_factory.h"
 #include "chrome/browser/extensions/installed_loader.h"
 #include "chrome/browser/extensions/pack_extension_job.h"
-#include "chrome/browser/extensions/pending_extension_info.h"
-#include "chrome/browser/extensions/pending_extension_manager.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/extensions/updater/extension_updater.h"
@@ -91,6 +89,8 @@
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/external_provider_interface.h"
 #include "extensions/browser/management_policy.h"
+#include "extensions/browser/pending_extension_info.h"
+#include "extensions/browser/pending_extension_manager.h"
 #include "extensions/browser/test_management_policy.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"

chrome/browser/extensions/updater/extension_updater.cc

@@ -20,7 +20,6 @@
 #include "chrome/browser/extensions/api/module/module.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/pending_extension_manager.h"
 #include "chrome/browser/extensions/updater/extension_downloader.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension_set.h"
@@ -30,6 +29,7 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "crypto/sha2.h"
+#include "extensions/browser/pending_extension_manager.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"

chrome/browser/sync/test/integration/sync_extension_helper.cc

@@ -11,11 +11,11 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_util.h"
-#include "chrome/browser/extensions/pending_extension_info.h"
-#include "chrome/browser/extensions/pending_extension_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
+#include "extensions/browser/pending_extension_info.h"
+#include "extensions/browser/pending_extension_manager.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/id_util.h"
 #include "extensions/common/manifest_constants.h"

chrome/browser/ui/ash/app_sync_ui_state.cc

@@ -8,7 +8,6 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
-#include "chrome/browser/extensions/pending_extension_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
@@ -17,6 +16,7 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
+#include "extensions/browser/pending_extension_manager.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/user_manager.h"

chrome/chrome_browser_extensions.gypi

@@ -834,10 +834,6 @@
         'browser/extensions/page_action_controller.h',
         'browser/extensions/pending_enables.cc',
         'browser/extensions/pending_enables.h',
-        'browser/extensions/pending_extension_info.cc',
-        'browser/extensions/pending_extension_info.h',
-        'browser/extensions/pending_extension_manager.cc',
-        'browser/extensions/pending_extension_manager.h',
         'browser/extensions/permissions_updater.cc',
         'browser/extensions/permissions_updater.h',
         'browser/extensions/plugin_manager.cc',

chrome/browser/extensions/pending_extension_info.cc → extensions/browser/pending_extension_info.cc

@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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/pending_extension_info.h"
+#include "extensions/browser/pending_extension_info.h"
 
 #include "base/logging.h"
 

chrome/browser/extensions/pending_extension_info.h → extensions/browser/pending_extension_info.h

@@ -1,20 +1,21 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#ifndef CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_INFO_H_
-#define CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_INFO_H_
+#ifndef EXTENSIONS_BROWSER_PENDING_EXTENSION_INFO_H_
+#define EXTENSIONS_BROWSER_PENDING_EXTENSION_INFO_H_
 
 #include <string>
 
+#include "base/gtest_prod_util.h"
 #include "base/version.h"
-#include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
 #include "url/gurl.h"
 
 FORWARD_DECLARE_TEST(ExtensionServiceTest, AddPendingExtensionFromSync);
 
 namespace extensions {
+class Extension;
 
 // A pending extension is an extension that hasn't been installed yet
 // and is intended to be installed in the next auto-update cycle.  The
@@ -91,4 +92,4 @@ class PendingExtensionInfo {
 
 }  // namespace extensions
 
-#endif  // CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_INFO_H_
+#endif  // EXTENSIONS_BROWSER_PENDING_EXTENSION_INFO_H_

chrome/browser/extensions/pending_extension_manager.cc → extensions/browser/pending_extension_manager.cc

@@ -1,15 +1,16 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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/pending_extension_manager.h"
+#include "extensions/browser/pending_extension_manager.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/version.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "content/public/browser/browser_thread.h"
+#include "extensions/common/extension.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;

chrome/browser/extensions/pending_extension_manager.h → extensions/browser/pending_extension_manager.h

@@ -1,20 +1,18 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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.
 
-#ifndef CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_MANAGER_H_
-#define CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_MANAGER_H_
+#ifndef EXTENSIONS_BROWSER_PENDING_EXTENSION_MANAGER_H_
+#define EXTENSIONS_BROWSER_PENDING_EXTENSION_MANAGER_H_
 
 #include <list>
 #include <string>
 
-#include "chrome/browser/extensions/pending_extension_info.h"
-#include "extensions/common/extension.h"
+#include "extensions/browser/pending_extension_info.h"
 #include "extensions/common/manifest.h"
 
 class ExtensionServiceInterface;
 class GURL;
-class PendingExtensionManager;
 
 namespace base {
 class Version;
@@ -24,6 +22,9 @@ FORWARD_DECLARE_TEST(ExtensionServiceTest,
                      UpdatePendingExtensionAlreadyInstalled);
 
 namespace extensions {
+class Extension;
+class PendingExtensionManager;
+
 class ExtensionUpdaterTest;
 void SetupPendingExtensionManagerForTest(
     int count, const GURL& update_url,
@@ -151,4 +152,4 @@ class PendingExtensionManager {
 
 }  // namespace extensions
 
-#endif  // CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_MANAGER_H_
+#endif  // EXTENSIONS_BROWSER_PENDING_EXTENSION_MANAGER_H_

extensions/extensions.gyp

@@ -193,6 +193,10 @@
         'browser/lazy_background_task_queue.h',
         'browser/management_policy.cc',
         'browser/management_policy.h',
+        'browser/pending_extension_info.cc',
+        'browser/pending_extension_info.h',
+        'browser/pending_extension_manager.cc',
+        'browser/pending_extension_manager.h',
         'browser/pref_names.cc',
         'browser/pref_names.h',
         'browser/process_manager.cc',