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

chrome/common/extensions/extension_file_util.cc

Index: chrome/common/extensions/extension_file_util.cc
diff --git a/chrome/common/extensions/extension_file_util.cc b/chrome/common/extensions/extension_file_util.cc
index f6d2e22c707a748fa7c70bffd40556f48519cddd..77fa7f3dae5c558beca8c13f45db7ace3aa53393 100644
--- a/chrome/common/extensions/extension_file_util.cc
+++ b/chrome/common/extensions/extension_file_util.cc
@@ -26,14 +26,17 @@
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/extensions/extension_resource.h"
+#include "chrome/common/extensions/manifest.h"
 #include "chrome/common/extensions/manifest_url_handler.h"
 #include "chrome/common/extensions/message_bundle.h"
+#include "extensions/common/install_warning.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "net/base/file_stream.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using extensions::Extension;
+using extensions::Manifest;
 
 namespace errors = extension_manifest_errors;
 
@@ -136,7 +139,7 @@ void UninstallExtension(const FilePath& extensions_dir,
 }
 
 scoped_refptr<Extension> LoadExtension(const FilePath& extension_path,
-                                       Extension::Location location,
+                                       Manifest::Location location,
                                        int flags,
                                        std::string* error) {
   return LoadExtension(extension_path, std::string(), location, flags, error);
@@ -144,7 +147,7 @@ scoped_refptr<Extension> LoadExtension(const FilePath& extension_path,
 
 scoped_refptr<Extension> LoadExtension(const FilePath& extension_path,
                                        const std::string& extension_id,
-                                       Extension::Location location,
+                                       Manifest::Location location,
                                        int flags,
                                        std::string* error) {
   scoped_ptr<DictionaryValue> manifest(LoadManifest(extension_path, error));
@@ -164,7 +167,7 @@ scoped_refptr<Extension> LoadExtension(const FilePath& extension_path,
   if (!extension.get())
     return NULL;
 
-  Extension::InstallWarningVector warnings;
+  std::vector<extensions::InstallWarning> warnings;
   if (!ValidateExtension(extension.get(), error, &warnings))
     return NULL;
   extension->AddInstallWarnings(warnings);
@@ -245,7 +248,7 @@ bool ValidateFilePath(const FilePath& path) {
 
 bool ValidateExtension(const Extension* extension,
                        std::string* error,
-                       Extension::InstallWarningVector* warnings) {
+                       std::vector<extensions::InstallWarning>* warnings) {
   // Validate icons exist.
   for (ExtensionIconSet::IconMap::const_iterator iter =
            extension->icons().map().begin();
@@ -413,8 +416,8 @@ bool ValidateExtension(const Extension* extension,
     }
   } else {
     for (size_t i = 0; i < private_keys.size(); ++i) {
-      warnings->push_back(Extension::InstallWarning(
-          Extension::InstallWarning::FORMAT_TEXT,
+      warnings->push_back(extensions::InstallWarning(
+          extensions::InstallWarning::FORMAT_TEXT,
           l10n_util::GetStringFUTF8(
               IDS_EXTENSION_CONTAINS_PRIVATE_KEY,
               private_keys[i].LossyDisplayName())));