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

chrome/browser/extensions/extension_function_test_utils.h

Index: chrome/browser/extensions/extension_function_test_utils.h
diff --git a/chrome/browser/extensions/extension_function_test_utils.h b/chrome/browser/extensions/extension_function_test_utils.h
index e42c1d52835a1daa1f80262782ae8deccc79b556..6459b53abed4d3eba2e366446c7ad2ef6a755ce4 100644
--- a/chrome/browser/extensions/extension_function_test_utils.h
+++ b/chrome/browser/extensions/extension_function_test_utils.h
@@ -9,6 +9,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest.h"
 
 class AsyncExtensionFunction;
 class Browser;
@@ -20,10 +21,6 @@ class DictionaryValue;
 class ListValue;
 }
 
-namespace extensions {
-class Extension;
-}
-
 namespace extension_function_test_utils {
 
 // Parse JSON and return as the specified type, or NULL if the JSON is invalid
@@ -52,7 +49,7 @@ scoped_refptr<extensions::Extension> CreateEmptyExtension();
 // Creates an extension instance with a specified location that can be attached
 // to an ExtensionFunction before running.
 scoped_refptr<extensions::Extension> CreateEmptyExtensionWithLocation(
-    extensions::Extension::Location location);
+    extensions::Manifest::Location location);
 
 // Creates an empty extension with a variable ID, for tests that require
 // multiple extensions side-by-side having distinct IDs. If not empty, then
@@ -64,7 +61,7 @@ scoped_refptr<extensions::Extension> CreateEmptyExtension(
     const std::string& id_input);
 
 scoped_refptr<extensions::Extension> CreateExtension(
-    extensions::Extension::Location location,
+    extensions::Manifest::Location location,
     base::DictionaryValue* test_extension_value,
     const std::string& id_input);
 
@@ -74,7 +71,7 @@ scoped_refptr<extensions::Extension> CreateExtension(
     base::DictionaryValue* test_extension_value);
 
 scoped_refptr<extensions::Extension> CreateExtension(
-    extensions::Extension::Location location,
+    extensions::Manifest::Location location,
     base::DictionaryValue* test_extension_value);
 
 // Returns true if |val| contains privacy information, e.g. url,