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

chrome/browser/extensions/admin_policy_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/extensions/admin_policy.h"
 
 #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,
                      "http://www.example.com");
     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");
     std::string error;
     extension_ = Extension::Create(FilePath(), location, *values,
                                    Extension::NO_FLAGS, &error);
     ASSERT_TRUE(extension_.get());
   }
 
  protected:
@@ skipping 10 matching lines @@
   blacklist.Append(Value::CreateStringValue("*"));
   EXPECT_TRUE(ap::BlacklistedByDefault(&blacklist));
 
   blacklist.Clear();
   blacklist.Append(Value::CreateStringValue("*"));
   EXPECT_TRUE(ap::BlacklistedByDefault(&blacklist));
 }
 
 // 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(),
                               &error));
   EXPECT_TRUE(error.empty());
 
   // Required extensions may load even if they're on the blacklist.
   base::ListValue blacklist;
   blacklist.Append(Value::CreateStringValue(extension_->id()));
   EXPECT_TRUE(ap::UserMayLoad(&blacklist, NULL, NULL, NULL, extension_.get(),
                               NULL));
 
   blacklist.Append(Value::CreateStringValue("*"));
   EXPECT_TRUE(ap::UserMayLoad(&blacklist, NULL, NULL, NULL, extension_.get(),
                               NULL));
 }
 
 // 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(),
                               NULL));
   string16 error;
   EXPECT_TRUE(ap::UserMayLoad(&blacklist, NULL, NULL, NULL, extension_.get(),
                               &error));
   EXPECT_TRUE(error.empty());
 }
 
 // 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()));
   EXPECT_TRUE(ap::UserMayLoad(NULL, &whitelist, NULL, NULL, extension_.get(),
                               NULL));
 
   base::ListValue blacklist;
   blacklist.Append(Value::CreateStringValue(extension_->id()));
   EXPECT_TRUE(ap::UserMayLoad(NULL, &whitelist, NULL, NULL, extension_.get(),
                               NULL));
   string16 error;
   EXPECT_TRUE(ap::UserMayLoad(NULL, &whitelist, NULL, NULL, extension_.get(),
                               &error));
   EXPECT_TRUE(error.empty());
 }
 
 // Tests UserMayLoad for an extension on the blacklist.
 TEST_F(ExtensionAdminPolicyTest, UserMayLoadBlacklisted) {
-  CreateExtension(Extension::INTERNAL);
+  CreateExtension(Manifest::INTERNAL);
 
   // Blacklisted by default.
   base::ListValue blacklist;
   blacklist.Append(Value::CreateStringValue("*"));
   EXPECT_FALSE(ap::UserMayLoad(&blacklist, NULL, NULL, NULL, extension_.get(),
                                NULL));
   string16 error;
   EXPECT_FALSE(ap::UserMayLoad(&blacklist, NULL, NULL, NULL, extension_.get(),
                                &error));
   EXPECT_FALSE(error.empty());
@@ skipping 12 matching lines @@
   whitelist.Append(
       Value::CreateStringValue("behllobkkfkfnphdnhnkndlbkcpglgmj"));
   EXPECT_FALSE(ap::UserMayLoad(&blacklist, &whitelist, NULL, NULL,
                                extension_.get(), NULL));
   whitelist.Append(Value::CreateStringValue("*"));
   EXPECT_FALSE(ap::UserMayLoad(&blacklist, &whitelist, NULL, NULL,
                                extension_.get(), NULL));
 }
 
 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));
   EXPECT_FALSE(error.empty());
 }
 
 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));
   EXPECT_TRUE(error.empty());
 }