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

Reverses the dependency between Extension and Manifest.
Part 1 of moving Manifest to top-level extensions.

BUG=162530
TBR=ben@chromium.org


Review URL: https://chromiumcodereview.appspot.com/12093036

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179828 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 5 deletions

diff --git a/chrome/browser/extensions/extension_function_test_utils.cc b/chrome/browser/extensions/extension_function_test_utils.cc
index d352966..157600b 100644
--- a/chrome/browser/extensions/extension_function_test_utils.cc
+++ b/chrome/browser/extensions/extension_function_test_utils.cc
@@ -19,6 +19,7 @@
 
 using content::WebContents;
 using extensions::Extension;
+using extensions::Manifest;
 namespace keys = extensions::tabs_constants;
 
 namespace {
@@ -102,11 +103,11 @@ base::ListValue* ToList(base::Value* val) {
 }
 
 scoped_refptr<Extension> CreateEmptyExtension() {
-  return CreateEmptyExtensionWithLocation(Extension::INTERNAL);
+  return CreateEmptyExtensionWithLocation(Manifest::INTERNAL);
 }
 
 scoped_refptr<Extension> CreateEmptyExtensionWithLocation(
-    Extension::Location location) {
+    Manifest::Location location) {
   scoped_ptr<base::DictionaryValue> test_extension_value(
       ParseDictionary("{\"name\": \"Test\", \"version\": \"1.0\"}"));
   return CreateExtension(location, test_extension_value.get(), std::string());
@@ -116,18 +117,18 @@ scoped_refptr<Extension> CreateEmptyExtension(
     const std::string& id_input) {
   scoped_ptr<base::DictionaryValue> test_extension_value(
       ParseDictionary("{\"name\": \"Test\", \"version\": \"1.0\"}"));
-  return CreateExtension(Extension::INTERNAL, test_extension_value.get(),
+  return CreateExtension(Manifest::INTERNAL, test_extension_value.get(),
                          id_input);
 }
 
 scoped_refptr<Extension> CreateExtension(
     base::DictionaryValue* test_extension_value) {
-  return CreateExtension(Extension::INTERNAL, test_extension_value,
+  return CreateExtension(Manifest::INTERNAL, test_extension_value,
                          std::string());
 }
 
 scoped_refptr<Extension> CreateExtension(
-    Extension::Location location,
+    Manifest::Location location,
     base::DictionaryValue* test_extension_value,
     const std::string& id_input) {
   std::string error;