Move ExtensionWarningService and ExtensionsWarningSet to extensions.

extensions/browser/warning_service.cc

Index: extensions/browser/warning_service.cc
diff --git a/chrome/browser/extensions/extension_warning_service.cc b/extensions/browser/warning_service.cc
similarity index 48%
rename from chrome/browser/extensions/extension_warning_service.cc
rename to extensions/browser/warning_service.cc
index ab929a26a58b9cf8e1fce1aec3e66da992995643..a6fba18d8ef0885ebe15135317bd4936c4a5925c 100644
--- a/chrome/browser/extensions/extension_warning_service.cc
+++ b/extensions/browser/warning_service.cc
@@ -2,36 +2,34 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/extensions/extension_warning_service.h"
+#include "extensions/browser/warning_service.h"
 
-#include "chrome/browser/browser_process.h"
-#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/profiles/profile_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
+#include "extensions/browser/extensions_browser_client.h"
+#include "extensions/common/extension_set.h"
 
 using content::BrowserThread;
 
 namespace extensions {
 
-ExtensionWarningService::ExtensionWarningService(Profile* profile)
-    : profile_(profile), extension_registry_observer_(this) {
+WarningService::WarningService(content::BrowserContext* browser_context)
+    : browser_context_(browser_context), extension_registry_observer_(this) {
   DCHECK(CalledOnValidThread());
-  if (profile_) {
-    extension_registry_observer_.Add(
-        ExtensionRegistry::Get(profile_->GetOriginalProfile()));
+  if (browser_context_) {
+    extension_registry_observer_.Add(ExtensionRegistry::Get(
+        ExtensionsBrowserClient::Get()->GetOriginalContext(browser_context_)));
   }
 }
 
-ExtensionWarningService::~ExtensionWarningService() {}
+WarningService::~WarningService() {}
 
-void ExtensionWarningService::ClearWarnings(
-    const std::set<ExtensionWarning::WarningType>& types) {
+void WarningService::ClearWarnings(
+    const std::set<Warning::WarningType>& types) {
   DCHECK(CalledOnValidThread());
   bool deleted_anything = false;
-  for (ExtensionWarningSet::iterator i = warnings_.begin();
+  for (WarningSet::iterator i = warnings_.begin();
        i != warnings_.end();) {
     if (types.find(i->warning_type()) != types.end()) {
       deleted_anything = true;
@@ -45,12 +43,11 @@ void ExtensionWarningService::ClearWarnings(
     NotifyWarningsChanged();
 }
 
-std::set<ExtensionWarning::WarningType>
-ExtensionWarningService::GetWarningTypesAffectingExtension(
-    const std::string& extension_id) const {
+std::set<Warning::WarningType> WarningService::
+    GetWarningTypesAffectingExtension(const std::string& extension_id) const {
   DCHECK(CalledOnValidThread());
-  std::set<ExtensionWarning::WarningType> result;
-  for (ExtensionWarningSet::const_iterator i = warnings_.begin();
+  std::set<Warning::WarningType> result;
+  for (WarningSet::const_iterator i = warnings_.begin();
        i != warnings_.end(); ++i) {
     if (i->extension_id() == extension_id)
       result.insert(i->warning_type());
@@ -58,25 +55,23 @@ ExtensionWarningService::GetWarningTypesAffectingExtension(
   return result;
 }
 
-std::vector<std::string>
-ExtensionWarningService::GetWarningMessagesForExtension(
+std::vector<std::string> WarningService::GetWarningMessagesForExtension(
     const std::string& extension_id) const {
   DCHECK(CalledOnValidThread());
   std::vector<std::string> result;
 
-  const ExtensionService* extension_service =
-      ExtensionSystem::Get(profile_)->extension_service();
+  const ExtensionSet& extension_set =
+      ExtensionRegistry::Get(browser_context_)->enabled_extensions();
 
-  for (ExtensionWarningSet::const_iterator i = warnings_.begin();
+  for (WarningSet::const_iterator i = warnings_.begin();
        i != warnings_.end(); ++i) {
     if (i->extension_id() == extension_id)
-      result.push_back(i->GetLocalizedMessage(extension_service->extensions()));
+      result.push_back(i->GetLocalizedMessage(&extension_set));
   }
   return result;
 }
 
-void ExtensionWarningService::AddWarnings(
-    const ExtensionWarningSet& warnings) {
+void WarningService::AddWarnings(const WarningSet& warnings) {
   DCHECK(CalledOnValidThread());
   size_t old_size = warnings_.size();
 
@@ -87,42 +82,44 @@ void ExtensionWarningService::AddWarnings(
 }
 
 // static
-void ExtensionWarningService::NotifyWarningsOnUI(
+void WarningService::NotifyWarningsOnUI(
     void* profile_id,
-    const ExtensionWarningSet& warnings) {
+    const WarningSet& warnings) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  Profile* profile = reinterpret_cast<Profile*>(profile_id);
-  if (!profile ||
-      !g_browser_process->profile_manager() ||
-      !g_browser_process->profile_manager()->IsValidProfile(profile)) {
+  content::BrowserContext* browser_context =
+      reinterpret_cast<content::BrowserContext*>(profile_id);
+
+  if (!browser_context ||
+      !ExtensionsBrowserClient::Get() ||
+      !ExtensionsBrowserClient::Get()->IsValidContext(browser_context)) {
     return;
   }
 
-  extensions::ExtensionWarningService* warning_service =
-      extensions::ExtensionSystem::Get(profile)->warning_service();
+  WarningService* warning_service =
+      ExtensionSystem::Get(browser_context)->warning_service();
 
   warning_service->AddWarnings(warnings);
 }
 
-void ExtensionWarningService::AddObserver(Observer* observer) {
+void WarningService::AddObserver(Observer* observer) {
   observer_list_.AddObserver(observer);
 }
 
-void ExtensionWarningService::RemoveObserver(Observer* observer) {
+void WarningService::RemoveObserver(Observer* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
-void ExtensionWarningService::NotifyWarningsChanged() {
+void WarningService::NotifyWarningsChanged() {
   FOR_EACH_OBSERVER(Observer, observer_list_, ExtensionWarningsChanged());
 }
 
-void ExtensionWarningService::OnExtensionUnloaded(
+void WarningService::OnExtensionUnloaded(
     content::BrowserContext* browser_context,
     const Extension* extension,
     UnloadedExtensionInfo::Reason reason) {
   // Unloading one extension might have solved the problems of others.
   // Therefore, we clear warnings of this type for all extensions.
-  std::set<ExtensionWarning::WarningType> warning_types =
+  std::set<Warning::WarningType> warning_types =
       GetWarningTypesAffectingExtension(extension->id());
   ClearWarnings(warning_types);
 }