Move ExtensionWarningService and ExtensionsWarningSet to extensions.

chrome/browser/extensions/extension_warning_badge_service_unittest.cc

Index: chrome/browser/extensions/extension_warning_badge_service_unittest.cc
diff --git a/chrome/browser/extensions/extension_warning_badge_service_unittest.cc b/chrome/browser/extensions/extension_warning_badge_service_unittest.cc
index 2eb91747e1c0f807a9ceb4aa82af9da9b7a9eab3..4b144d1e64117d17d620c39212dbfed2fac3a6a0 100644
--- a/chrome/browser/extensions/extension_warning_badge_service_unittest.cc
+++ b/chrome/browser/extensions/extension_warning_badge_service_unittest.cc
@@ -5,26 +5,26 @@
 #include "chrome/browser/extensions/extension_warning_badge_service.h"
 
 #include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/extensions/extension_warning_set.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/test/base/testing_profile.h"
+#include "extensions/browser/warning_service.h"
+#include "extensions/browser/warning_set.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
 namespace {
 
-class TestExtensionWarningSet : public ExtensionWarningService {
+class TestExtensionWarningSet : public WarningService {
  public:
-  explicit TestExtensionWarningSet(Profile* profile)
-      : ExtensionWarningService(profile) {
+  explicit TestExtensionWarningSet(Profile* profile) : WarningService(profile) {
   }
   virtual ~TestExtensionWarningSet() {}
 
-  void AddWarning(const ExtensionWarning& warning) {
-    ExtensionWarningSet warnings;
+  void AddWarning(const Warning& warning) {
+    WarningSet warnings;
     warnings.insert(warning);
     AddWarnings(warnings);
   }
@@ -33,18 +33,18 @@ class TestExtensionWarningSet : public ExtensionWarningService {
 class TestExtensionWarningBadgeService : public ExtensionWarningBadgeService {
  public:
   TestExtensionWarningBadgeService(Profile* profile,
-                                   ExtensionWarningService* warning_service)
+                                   WarningService* warning_service)
       : ExtensionWarningBadgeService(profile),
         warning_service_(warning_service) {}
   virtual ~TestExtensionWarningBadgeService() {}
 
-  virtual const std::set<ExtensionWarning>&
+  virtual const std::set<Warning>&
   GetCurrentWarnings() const OVERRIDE {
     return warning_service_->warnings();
   }
 
  private:
-  ExtensionWarningService* warning_service_;
+  WarningService* warning_service_;
 };
 
 bool HasBadge(Profile* profile) {
@@ -68,7 +68,7 @@ TEST(ExtensionWarningBadgeServiceTest, SuppressBadgeForCurrentWarnings) {
   warnings.AddObserver(&badge_service);
 
   // Insert first warning.
-  warnings.AddWarning(ExtensionWarning::CreateNetworkDelayWarning(ext1_id));
+  warnings.AddWarning(Warning::CreateNetworkDelayWarning(ext1_id));
   EXPECT_TRUE(HasBadge(&profile));
 
   // Suppress first warning.
@@ -76,17 +76,17 @@ TEST(ExtensionWarningBadgeServiceTest, SuppressBadgeForCurrentWarnings) {
   EXPECT_FALSE(HasBadge(&profile));
 
   // Simulate deinstallation of extension.
-  std::set<ExtensionWarning::WarningType> to_clear =
+  std::set<Warning::WarningType> to_clear =
       warnings.GetWarningTypesAffectingExtension(ext1_id);
   warnings.ClearWarnings(to_clear);
   EXPECT_FALSE(HasBadge(&profile));
 
   // Set first warning again and verify that not badge is shown this time.
-  warnings.AddWarning(ExtensionWarning::CreateNetworkDelayWarning(ext1_id));
+  warnings.AddWarning(Warning::CreateNetworkDelayWarning(ext1_id));
   EXPECT_FALSE(HasBadge(&profile));
 
   // Set second warning and verify that it shows a badge.
-  warnings.AddWarning(ExtensionWarning::CreateNetworkConflictWarning(ext2_id));
+  warnings.AddWarning(Warning::CreateNetworkConflictWarning(ext2_id));
   EXPECT_TRUE(HasBadge(&profile));
 
   warnings.RemoveObserver(&badge_service);