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

chrome/browser/extensions/extension_special_storage_policy_unittest.cc

Index: chrome/browser/extensions/extension_special_storage_policy_unittest.cc
diff --git a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc
index bb6249141a49279b03aa6fabf07c36331a9f74cd..4dd098a994a1d26cdb9a4f0a3ab456ad9fe06188 100644
--- a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc
+++ b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc
@@ -10,6 +10,7 @@
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
+#include "chrome/common/extensions/manifest.h"
 #include "chrome/common/extensions/manifest_handler.h"
 #include "chrome/common/extensions/web_intents_handler.h"
 #include "chrome/test/base/testing_profile.h"
@@ -18,6 +19,7 @@
 
 using content::BrowserThread;
 using extensions::Extension;
+using extensions::Manifest;
 
 namespace keys = extension_manifest_keys;
 
@@ -46,7 +48,8 @@ class ExtensionSpecialStoragePolicyTest : public testing::Test {
     manifest.Set(keys::kWebURLs, list);
     std::string error;
     scoped_refptr<Extension> protected_app = Extension::Create(
-        path, Extension::INVALID, manifest, Extension::NO_FLAGS, &error);
+        path, Manifest::INVALID_LOCATION, manifest,
+        Extension::NO_FLAGS, &error);
     EXPECT_TRUE(protected_app.get()) << error;
     return protected_app;
   }
@@ -70,7 +73,8 @@ class ExtensionSpecialStoragePolicyTest : public testing::Test {
     manifest.Set(keys::kWebURLs, list);
     std::string error;
     scoped_refptr<Extension> unlimited_app = Extension::Create(
-        path, Extension::INVALID, manifest, Extension::NO_FLAGS, &error);
+        path, Manifest::INVALID_LOCATION, manifest,
+        Extension::NO_FLAGS, &error);
     EXPECT_TRUE(unlimited_app.get()) << error;
     return unlimited_app;
   }
@@ -96,7 +100,7 @@ class ExtensionSpecialStoragePolicyTest : public testing::Test {
     manifest.Set(keys::kPermissions, list);
     std::string error;
     scoped_refptr<Extension> component_app = Extension::Create(
-        path, Extension::COMPONENT, manifest, Extension::NO_FLAGS, &error);
+        path, Manifest::COMPONENT, manifest, Extension::NO_FLAGS, &error);
     EXPECT_TRUE(component_app.get()) << error;
     return component_app;
   }
@@ -121,7 +125,8 @@ class ExtensionSpecialStoragePolicyTest : public testing::Test {
     manifest.Set(keys::kPermissions, list);
     std::string error;
     scoped_refptr<Extension> handler_app = Extension::Create(
-        path, Extension::INVALID, manifest, Extension::NO_FLAGS, &error);
+        path, Manifest::INVALID_LOCATION, manifest,
+        Extension::NO_FLAGS, &error);
     EXPECT_TRUE(handler_app.get()) << error;
     return handler_app;
   }
@@ -154,7 +159,8 @@ class ExtensionSpecialStoragePolicyTest : public testing::Test {
 
     std::string error;
     scoped_refptr<Extension> intent_app = Extension::Create(
-        path, Extension::INVALID, manifest, Extension::NO_FLAGS, &error);
+        path, Manifest::INVALID_LOCATION, manifest,
+        Extension::NO_FLAGS, &error);
     EXPECT_TRUE(intent_app.get()) << error;
     return intent_app;
   }