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

chrome/common/extensions/manifest_tests/extension_manifest_test.cc

Index: chrome/common/extensions/manifest_tests/extension_manifest_test.cc
diff --git a/chrome/common/extensions/manifest_tests/extension_manifest_test.cc b/chrome/common/extensions/manifest_tests/extension_manifest_test.cc
index 9b0159863a45511844dfbd87de3abcbd2b20927f..80f339212378ab0567e48c5cb89a505276afd094 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifest_test.cc
+++ b/chrome/common/extensions/manifest_tests/extension_manifest_test.cc
@@ -10,7 +10,6 @@
 #include "base/json/json_file_value_serializer.h"
 #include "base/path_service.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ -89,7 +88,7 @@ DictionaryValue* ExtensionManifestTest::Manifest::GetManifest(
 scoped_refptr<Extension> ExtensionManifestTest::LoadExtension(
     const Manifest& manifest,
     std::string* error,
-    Extension::Location location,
+    extensions::Manifest::Location location,
     int flags) {
   DictionaryValue* value = manifest.GetManifest(error);
   if (!value)
@@ -102,7 +101,7 @@ scoped_refptr<Extension> ExtensionManifestTest::LoadExtension(
 
 scoped_refptr<Extension> ExtensionManifestTest::LoadAndExpectSuccess(
     const Manifest& manifest,
-    Extension::Location location,
+    extensions::Manifest::Location location,
     int flags) {
   std::string error;
   scoped_refptr<Extension> extension =
@@ -114,7 +113,7 @@ scoped_refptr<Extension> ExtensionManifestTest::LoadAndExpectSuccess(
 
 scoped_refptr<Extension> ExtensionManifestTest::LoadAndExpectSuccess(
     char const* manifest_name,
-    Extension::Location location,
+    extensions::Manifest::Location location,
     int flags) {
   return LoadAndExpectSuccess(Manifest(manifest_name), location, flags);
 }
@@ -122,7 +121,7 @@ scoped_refptr<Extension> ExtensionManifestTest::LoadAndExpectSuccess(
 scoped_refptr<Extension> ExtensionManifestTest::LoadAndExpectWarning(
     const Manifest& manifest,
     const std::string& expected_warning,
-    Extension::Location location,
+    extensions::Manifest::Location location,
     int flags) {
   std::string error;
   scoped_refptr<Extension> extension =
@@ -137,7 +136,7 @@ scoped_refptr<Extension> ExtensionManifestTest::LoadAndExpectWarning(
 scoped_refptr<Extension> ExtensionManifestTest::LoadAndExpectWarning(
     char const* manifest_name,
     const std::string& expected_warning,
-    Extension::Location location,
+    extensions::Manifest::Location location,
     int flags) {
   return LoadAndExpectWarning(
       Manifest(manifest_name), expected_warning, location, flags);
@@ -158,7 +157,7 @@ void ExtensionManifestTest::VerifyExpectedError(
 void ExtensionManifestTest::LoadAndExpectError(
     const Manifest& manifest,
     const std::string& expected_error,
-    Extension::Location location,
+    extensions::Manifest::Location location,
     int flags) {
   std::string error;
   scoped_refptr<Extension> extension(
@@ -170,7 +169,7 @@ void ExtensionManifestTest::LoadAndExpectError(
 void ExtensionManifestTest::LoadAndExpectError(
     char const* manifest_name,
     const std::string& expected_error,
-    Extension::Location location,
+    extensions::Manifest::Location location,
     int flags) {
   return LoadAndExpectError(
       Manifest(manifest_name), expected_error, location, flags);
@@ -182,10 +181,11 @@ void ExtensionManifestTest::AddPattern(extensions::URLPatternSet* extent,
   extent->AddPattern(URLPattern(schemes, pattern));
 }
 
-ExtensionManifestTest::Testcase::Testcase(std::string manifest_filename,
-                                          std::string expected_error,
-                                          Extension::Location location,
-                                          int flags)
+ExtensionManifestTest::Testcase::Testcase(
+    std::string manifest_filename,
+    std::string expected_error,
+    extensions::Manifest::Location location,
+    int flags)
     : manifest_filename_(manifest_filename),
       expected_error_(expected_error),
       location_(location), flags_(flags) {
@@ -195,20 +195,21 @@ ExtensionManifestTest::Testcase::Testcase(std::string manifest_filename,
                                           std::string expected_error)
     : manifest_filename_(manifest_filename),
       expected_error_(expected_error),
-      location_(Extension::INTERNAL),
+      location_(extensions::Manifest::INTERNAL),
       flags_(Extension::NO_FLAGS) {
 }
 
 ExtensionManifestTest::Testcase::Testcase(std::string manifest_filename)
     : manifest_filename_(manifest_filename),
       expected_error_(""),
-      location_(Extension::INTERNAL),
+      location_(extensions::Manifest::INTERNAL),
       flags_(Extension::NO_FLAGS) {
 }
 
-ExtensionManifestTest::Testcase::Testcase(std::string manifest_filename,
-                                          Extension::Location location,
-                                          int flags)
+ExtensionManifestTest::Testcase::Testcase(
+    std::string manifest_filename,
+    extensions::Manifest::Location location,
+    int flags)
     : manifest_filename_(manifest_filename),
       expected_error_(""),
       location_(location),