Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file.

chrome/browser/extensions/admin_policy_unittest.cc

Index: chrome/browser/extensions/admin_policy_unittest.cc
diff --git a/chrome/browser/extensions/admin_policy_unittest.cc b/chrome/browser/extensions/admin_policy_unittest.cc
index b86e8f81b7fbe49d214b2e880bbab869c32d0efe..d74e361f0285c370b8365ad288a1e08a58974209 100644
--- a/chrome/browser/extensions/admin_policy_unittest.cc
+++ b/chrome/browser/extensions/admin_policy_unittest.cc
@@ -7,21 +7,23 @@
 #include "base/values.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
+#include "chrome/common/extensions/manifest.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Value;
 using extensions::Extension;
+using extensions::Manifest;
 
 namespace ap = extensions::admin_policy;
 
 class ExtensionAdminPolicyTest : public testing::Test {
  public:
-  void CreateExtension(Extension::Location location) {
+  void CreateExtension(Manifest::Location location) {
     base::DictionaryValue values;
     CreateExtensionFromValues(location, &values);
   }
 
-  void CreateHostedApp(Extension::Location location) {
+  void CreateHostedApp(Manifest::Location location) {
     base::DictionaryValue values;
     values.Set(extension_manifest_keys::kWebURLs, new base::ListValue());
     values.SetString(extension_manifest_keys::kLaunchWebURL,
@@ -29,7 +31,7 @@ class ExtensionAdminPolicyTest : public testing::Test {
     CreateExtensionFromValues(location, &values);
   }
 
-  void CreateExtensionFromValues(Extension::Location location,
+  void CreateExtensionFromValues(Manifest::Location location,
                                  base::DictionaryValue* values) {
     values->SetString(extension_manifest_keys::kName, "test");
     values->SetString(extension_manifest_keys::kVersion, "0.1");
@@ -60,7 +62,7 @@ TEST_F(ExtensionAdminPolicyTest, BlacklistedByDefault) {
 
 // Tests UserMayLoad for required extensions.
 TEST_F(ExtensionAdminPolicyTest, UserMayLoadRequired) {
-  CreateExtension(Extension::COMPONENT);
+  CreateExtension(Manifest::COMPONENT);
   EXPECT_TRUE(ap::UserMayLoad(NULL, NULL, NULL, NULL, extension_.get(), NULL));
   string16 error;
   EXPECT_TRUE(ap::UserMayLoad(NULL, NULL, NULL, NULL, extension_.get(),
@@ -80,7 +82,7 @@ TEST_F(ExtensionAdminPolicyTest, UserMayLoadRequired) {
 
 // Tests UserMayLoad when no blacklist exists, or it's empty.
 TEST_F(ExtensionAdminPolicyTest, UserMayLoadNoBlacklist) {
-  CreateExtension(Extension::INTERNAL);
+  CreateExtension(Manifest::INTERNAL);
   EXPECT_TRUE(ap::UserMayLoad(NULL, NULL, NULL, NULL, extension_.get(), NULL));
   base::ListValue blacklist;
   EXPECT_TRUE(ap::UserMayLoad(&blacklist, NULL, NULL, NULL, extension_.get(),
@@ -93,7 +95,7 @@ TEST_F(ExtensionAdminPolicyTest, UserMayLoadNoBlacklist) {
 
 // Tests UserMayLoad for an extension on the whitelist.
 TEST_F(ExtensionAdminPolicyTest, UserMayLoadWhitelisted) {
-  CreateExtension(Extension::INTERNAL);
+  CreateExtension(Manifest::INTERNAL);
 
   base::ListValue whitelist;
   whitelist.Append(Value::CreateStringValue(extension_->id()));
@@ -112,7 +114,7 @@ TEST_F(ExtensionAdminPolicyTest, UserMayLoadWhitelisted) {
 
 // Tests UserMayLoad for an extension on the blacklist.
 TEST_F(ExtensionAdminPolicyTest, UserMayLoadBlacklisted) {
-  CreateExtension(Extension::INTERNAL);
+  CreateExtension(Manifest::INTERNAL);
 
   // Blacklisted by default.
   base::ListValue blacklist;
@@ -145,34 +147,34 @@ TEST_F(ExtensionAdminPolicyTest, UserMayLoadBlacklisted) {
 }
 
 TEST_F(ExtensionAdminPolicyTest, UserMayLoadAllowedTypes) {
-  CreateExtension(Extension::INTERNAL);
+  CreateExtension(Manifest::INTERNAL);
   EXPECT_TRUE(ap::UserMayLoad(NULL, NULL, NULL, NULL, extension_.get(), NULL));
 
   base::ListValue allowed_types;
   EXPECT_FALSE(ap::UserMayLoad(NULL, NULL, NULL, &allowed_types,
                                extension_.get(), NULL));
 
-  allowed_types.AppendInteger(Extension::TYPE_EXTENSION);
+  allowed_types.AppendInteger(Manifest::TYPE_EXTENSION);
   EXPECT_TRUE(ap::UserMayLoad(NULL, NULL, NULL, &allowed_types,
                               extension_.get(), NULL));
 
-  CreateHostedApp(Extension::INTERNAL);
+  CreateHostedApp(Manifest::INTERNAL);
   EXPECT_FALSE(ap::UserMayLoad(NULL, NULL, NULL, &allowed_types,
                                extension_.get(), NULL));
 
-  CreateHostedApp(Extension::EXTERNAL_POLICY_DOWNLOAD);
+  CreateHostedApp(Manifest::EXTERNAL_POLICY_DOWNLOAD);
   EXPECT_FALSE(ap::UserMayLoad(NULL, NULL, NULL, &allowed_types,
                                extension_.get(), NULL));
 }
 
 TEST_F(ExtensionAdminPolicyTest, UserMayModifySettings) {
-  CreateExtension(Extension::INTERNAL);
+  CreateExtension(Manifest::INTERNAL);
   EXPECT_TRUE(ap::UserMayModifySettings(extension_.get(), NULL));
   string16 error;
   EXPECT_TRUE(ap::UserMayModifySettings(extension_.get(), &error));
   EXPECT_TRUE(error.empty());
 
-  CreateExtension(Extension::EXTERNAL_POLICY_DOWNLOAD);
+  CreateExtension(Manifest::EXTERNAL_POLICY_DOWNLOAD);
   error.clear();
   EXPECT_FALSE(ap::UserMayModifySettings(extension_.get(), NULL));
   EXPECT_FALSE(ap::UserMayModifySettings(extension_.get(), &error));
@@ -180,13 +182,13 @@ TEST_F(ExtensionAdminPolicyTest, UserMayModifySettings) {
 }
 
 TEST_F(ExtensionAdminPolicyTest, MustRemainEnabled) {
-  CreateExtension(Extension::EXTERNAL_POLICY_DOWNLOAD);
+  CreateExtension(Manifest::EXTERNAL_POLICY_DOWNLOAD);
   EXPECT_TRUE(ap::MustRemainEnabled(extension_.get(), NULL));
   string16 error;
   EXPECT_TRUE(ap::MustRemainEnabled(extension_.get(), &error));
   EXPECT_FALSE(error.empty());
 
-  CreateExtension(Extension::INTERNAL);
+  CreateExtension(Manifest::INTERNAL);
   error.clear();
   EXPECT_FALSE(ap::MustRemainEnabled(extension_.get(), NULL));
   EXPECT_FALSE(ap::MustRemainEnabled(extension_.get(), &error));