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

chrome/browser/extensions/extension_function_test_utils.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_TEST_UTILS_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_TEST_UTILS_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest.h"
 
 class AsyncExtensionFunction;
 class Browser;
 class UIThreadExtensionFunction;
 
 namespace base {
 class Value;
 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
 // or not the specified type.
 base::Value* ParseJSON(const std::string& data);
 base::ListValue* ParseList(const std::string& data);
 base::DictionaryValue* ParseDictionary(const std::string& data);
 
 // Get |key| from |val| as the specified type. If |key| does not exist, or is
 // not of the specified type, adds a failure to the current test and returns
 // false, 0, empty string, etc.
 bool GetBoolean(base::DictionaryValue* val, const std::string& key);
 int GetInteger(base::DictionaryValue* val, const std::string& key);
 std::string GetString(base::DictionaryValue* val, const std::string& key);
 
 // If |val| is a dictionary, return it as one, otherwise NULL.
 base::DictionaryValue* ToDictionary(base::Value* val);
 
 // If |val| is a list, return it as one, otherwise NULL.
 base::ListValue* ToList(base::Value* val);
 
 // Creates an extension instance that can be attached to an ExtensionFunction
 // before running it.
 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
 // id_input is passed directly to Extension::CreateId() and thus has the same
 // behavior as that method. If id_input is empty, then Extension::Create()
 // receives an empty explicit ID and generates an appropriate ID for a blank
 // extension.
 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);
 
 // Creates an extension instance with a specified extension value that can be
 // attached to an ExtensionFunction before running.
 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,
 // title, and faviconUrl.
 bool HasPrivacySensitiveFields(base::DictionaryValue* val);
 
 enum RunFunctionFlags {
   NONE = 0,
   INCLUDE_INCOGNITO = 1 << 0
 };
@@ skipping 32 matching lines @@
 // we're going to need to frob for all the different extension functions. But
 // we can refactor when we see what is needed.
 bool RunFunction(UIThreadExtensionFunction* function,
                  const std::string& args,
                  Browser* browser,
                  RunFunctionFlags flags);
 
 } // namespace extension_function_test_utils
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_TEST_UTILS_H_