Remove the last c/b/e/extension_service.h includes from src/extensions

This breaks another unwanted dependency from src/extensions back to src/chrome.

* Move PendingExtensionManager and PendingExtensionInfo back into chrome, as
  they are tied to the concepts of extension install/update and we have
  decided to keep that functionality in chrome for now.
* Eliminate unused include in extension_function.cc

No functional changes.

BUG=none
TEST=compiles
TBR=zea@chromium.org for header file move touching chrome/browser/sync/test/integration/sync_extension_helper.cc

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

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

14 files changed, 25 insertions, 27 deletions

diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index a74de00..992d262 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -44,6 +44,7 @@
 #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/updater/extension_cache.h"
@@ -78,7 +79,6 @@
 #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/pref_names.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/browser/process_map.h"
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index 48ff38a..52fab6b 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -20,6 +20,7 @@
 #include "base/strings/string16.h"
 #include "chrome/browser/extensions/blacklist.h"
 #include "chrome/browser/extensions/extension_sync_service.h"
+#include "chrome/browser/extensions/pending_extension_manager.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/notification_observer.h"
@@ -28,7 +29,6 @@
 #include "extensions/browser/extension_prefs.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/extension.h"
 #include "extensions/common/extension_set.h"
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index ab5bfe9..29da632 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -55,6 +55,8 @@
 #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_blacklist.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
@@ -91,8 +93,6 @@
 #include "extensions/browser/extension_system.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/pref_names.h"
 #include "extensions/browser/test_management_policy.h"
 #include "extensions/common/constants.h"
diff --git a/extensions/browser/pending_extension_info.cc b/chrome/browser/extensions/pending_extension_info.cc
index 0abcdf6..bb0d452 100644
--- a/extensions/browser/pending_extension_info.cc
+++ b/chrome/browser/extensions/pending_extension_info.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 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 "extensions/browser/pending_extension_info.h"
+#include "chrome/browser/extensions/pending_extension_info.h"
 
 #include "base/logging.h"
 
diff --git a/extensions/browser/pending_extension_info.h b/chrome/browser/extensions/pending_extension_info.h
index fd1d3ae..fd803bd 100644
--- a/extensions/browser/pending_extension_info.h
+++ b/chrome/browser/extensions/pending_extension_info.h
@@ -1,9 +1,9 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 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 EXTENSIONS_BROWSER_PENDING_EXTENSION_INFO_H_
-#define EXTENSIONS_BROWSER_PENDING_EXTENSION_INFO_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_INFO_H_
+#define CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_INFO_H_
 
 #include <string>
 
@@ -92,4 +92,4 @@ class PendingExtensionInfo {
 
 }  // namespace extensions
 
-#endif  // EXTENSIONS_BROWSER_PENDING_EXTENSION_INFO_H_
+#endif  // CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_INFO_H_
diff --git a/extensions/browser/pending_extension_manager.cc b/chrome/browser/extensions/pending_extension_manager.cc
index d16b92b..e2a636d 100644
--- a/extensions/browser/pending_extension_manager.cc
+++ b/chrome/browser/extensions/pending_extension_manager.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 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 "extensions/browser/pending_extension_manager.h"
+#include "chrome/browser/extensions/pending_extension_manager.h"
 
 #include <algorithm>
 
diff --git a/extensions/browser/pending_extension_manager.h b/chrome/browser/extensions/pending_extension_manager.h
index beedc05..4c3572c 100644
--- a/extensions/browser/pending_extension_manager.h
+++ b/chrome/browser/extensions/pending_extension_manager.h
@@ -1,14 +1,14 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 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 EXTENSIONS_BROWSER_PENDING_EXTENSION_MANAGER_H_
-#define EXTENSIONS_BROWSER_PENDING_EXTENSION_MANAGER_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_MANAGER_H_
+#define CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_MANAGER_H_
 
 #include <list>
 #include <string>
 
-#include "extensions/browser/pending_extension_info.h"
+#include "chrome/browser/extensions/pending_extension_info.h"
 #include "extensions/common/manifest.h"
 
 class ExtensionServiceInterface;
@@ -152,4 +152,4 @@ class PendingExtensionManager {
 
 }  // namespace extensions
 
-#endif  // EXTENSIONS_BROWSER_PENDING_EXTENSION_MANAGER_H_
+#endif  // CHROME_BROWSER_EXTENSIONS_PENDING_EXTENSION_MANAGER_H_
diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/browser/extensions/updater/extension_updater.cc
index 523614f..45f1ab8 100644
--- a/chrome/browser/extensions/updater/extension_updater.cc
+++ b/chrome/browser/extensions/updater/extension_updater.cc
@@ -20,6 +20,7 @@
 #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/pref_names.h"
@@ -29,7 +30,6 @@
 #include "content/public/browser/notification_source.h"
 #include "crypto/sha2.h"
 #include "extensions/browser/extension_registry.h"
-#include "extensions/browser/pending_extension_manager.h"
 #include "extensions/browser/pref_names.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
diff --git a/chrome/browser/sync/test/integration/sync_extension_helper.cc b/chrome/browser/sync/test/integration/sync_extension_helper.cc
index 7355503..6e09377 100644
--- a/chrome/browser/sync/test/integration/sync_extension_helper.cc
+++ b/chrome/browser/sync/test/integration/sync_extension_helper.cc
@@ -10,13 +10,13 @@
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_service.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/extension_registry.h"
 #include "extensions/browser/extension_system.h"
-#include "extensions/browser/pending_extension_info.h"
-#include "extensions/browser/pending_extension_manager.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/id_util.h"
diff --git a/chrome/browser/ui/ash/app_sync_ui_state.cc b/chrome/browser/ui/ash/app_sync_ui_state.cc
index c911e4a..c3a9b3b 100644
--- a/chrome/browser/ui/ash/app_sync_ui_state.cc
+++ b/chrome/browser/ui/ash/app_sync_ui_state.cc
@@ -7,6 +7,7 @@
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.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"
@@ -16,7 +17,6 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "extensions/browser/extension_system.h"
-#include "extensions/browser/pending_extension_manager.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/user_manager.h"
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index 5ffff97..ebde052 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -805,6 +805,10 @@
         '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',
diff --git a/extensions/browser/DEPS b/extensions/browser/DEPS
index 5a3b8bd..cd49174 100644
--- a/extensions/browser/DEPS
+++ b/extensions/browser/DEPS
@@ -20,7 +20,6 @@ include_rules = [
   "+chrome/browser/extensions/api/runtime/runtime_api.h",
   "+chrome/browser/extensions/extension_function_dispatcher.h",
   "+chrome/browser/extensions/extension_host.h",
-  "+chrome/browser/extensions/extension_service.h",
   "+chrome/browser/renderer_host/chrome_render_message_filter.h",
   "+chrome/common/extensions/api/sockets/sockets_manifest_data.h",
   "+chrome/common/extensions/features/feature_channel.h",
diff --git a/extensions/browser/extension_function.cc b/extensions/browser/extension_function.cc
index e16d895..2eababe 100644
--- a/extensions/browser/extension_function.cc
+++ b/extensions/browser/extension_function.cc
@@ -7,7 +7,6 @@
 #include "base/logging.h"
 #include "base/metrics/sparse_histogram.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
-#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index d3a8704..feb2dd5 100644
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -270,10 +270,6 @@
         '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',