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

chrome/common/extensions/extension_builder.h

Index: chrome/common/extensions/extension_builder.h
diff --git a/chrome/common/extensions/extension_builder.h b/chrome/common/extensions/extension_builder.h
index 209b70494e9ce5bbc8dc45b6b3bcab71cabaf6d9..b62092b752e75bb21158ae03b9e30eadca8e33bc 100644
--- a/chrome/common/extensions/extension_builder.h
+++ b/chrome/common/extensions/extension_builder.h
@@ -5,12 +5,14 @@
 #ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_BUILDER_H_
 #define CHROME_COMMON_EXTENSIONS_EXTENSION_BUILDER_H_
 
+#include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest.h"
 #include "chrome/common/extensions/value_builder.h"
 
 namespace extensions {
+class Extension;
 
 // An easier way to create extensions than Extension::Create.  The
 // constructor sets up some defaults which are customized using the
@@ -27,8 +29,8 @@ class ExtensionBuilder {
   // Defaults to FilePath().
   ExtensionBuilder& SetPath(const FilePath& path);
 
-  // Defaults to Extension::LOAD.
-  ExtensionBuilder& SetLocation(Extension::Location location);
+  // Defaults to Manifest::LOAD.
+  ExtensionBuilder& SetLocation(Manifest::Location location);
 
   ExtensionBuilder& SetManifest(scoped_ptr<base::DictionaryValue> manifest);
   ExtensionBuilder& SetManifest(DictionaryBuilder& manifest_builder) {
@@ -42,7 +44,7 @@ class ExtensionBuilder {
 
  private:
   FilePath path_;
-  Extension::Location location_;
+  Manifest::Location location_;
   scoped_ptr<base::DictionaryValue> manifest_;
   int flags_;
   std::string id_;