Move ExtensionWarningService and ExtensionsWarningSet to extensions.

chrome/browser/extensions/extension_system_impl.cc

Index: chrome/browser/extensions/extension_system_impl.cc
diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc
index 3e1748044d6e06d0e951ce4a5bfc14b31864ca15..63583caa3bc30f182b3bbce45cb45f2fed989f13 100644
--- a/chrome/browser/extensions/extension_system_impl.cc
+++ b/chrome/browser/extensions/extension_system_impl.cc
@@ -24,7 +24,6 @@
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/extension_warning_badge_service.h"
-#include "chrome/browser/extensions/extension_warning_set.h"
 #include "chrome/browser/extensions/install_verifier.h"
 #include "chrome/browser/extensions/navigation_observer.h"
 #include "chrome/browser/extensions/shared_module_service.h"
@@ -59,6 +58,8 @@
 #include "extensions/browser/quota_service.h"
 #include "extensions/browser/runtime_data.h"
 #include "extensions/browser/state_store.h"
+#include "extensions/browser/warning_service.h"
+#include "extensions/browser/warning_set.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
@@ -383,10 +384,10 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
   // Make the chrome://extension-icon/ resource available.
   content::URLDataSource::Add(profile_, new ExtensionIconSource(profile_));
 
-  extension_warning_service_.reset(new ExtensionWarningService(profile_));
+  warning_service_.reset(new WarningService(profile_));
   extension_warning_badge_service_.reset(
       new ExtensionWarningBadgeService(profile_));
-  extension_warning_service_->AddObserver(
+  warning_service_->AddObserver(
       extension_warning_badge_service_.get());
   error_console_.reset(new ErrorConsole(profile_));
   quota_service_.reset(new QuotaService);
@@ -411,8 +412,8 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
 }
 
 void ExtensionSystemImpl::Shared::Shutdown() {
-  if (extension_warning_service_) {
-    extension_warning_service_->RemoveObserver(
+  if (warning_service_) {
+    warning_service_->RemoveObserver(
         extension_warning_badge_service_.get());
   }
   if (content_verifier_.get())
@@ -461,8 +462,8 @@ EventRouter* ExtensionSystemImpl::Shared::event_router() {
   return event_router_.get();
 }
 
-ExtensionWarningService* ExtensionSystemImpl::Shared::warning_service() {
-  return extension_warning_service_.get();
+WarningService* ExtensionSystemImpl::Shared::warning_service() {
+  return warning_service_.get();
 }
 
 Blacklist* ExtensionSystemImpl::Shared::blacklist() {
@@ -579,7 +580,7 @@ EventRouter* ExtensionSystemImpl::event_router() {
   return shared_->event_router();
 }
 
-ExtensionWarningService* ExtensionSystemImpl::warning_service() {
+WarningService* ExtensionSystemImpl::warning_service() {
   return shared_->warning_service();
 }