| 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 27336a52e1f5f4ddc3ba736ceae3911d4b88b09c..3ae6db8a28013b225542013b4822f8c1ea6d6e40 100644
|
| --- a/chrome/browser/extensions/extension_function_test_utils.h
|
| +++ b/chrome/browser/extensions/extension_function_test_utils.h
|
| @@ -13,7 +13,6 @@
|
|
|
| class AsyncExtensionFunction;
|
| class Browser;
|
| -class Extension;
|
| class UIThreadExtensionFunction;
|
|
|
| namespace base {
|
| @@ -22,6 +21,10 @@ 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
|
| @@ -45,12 +48,12 @@ base::ListValue* ToList(base::Value* val);
|
|
|
| // Creates an extension instance that can be attached to an ExtensionFunction
|
| // before running it.
|
| -scoped_refptr<Extension> CreateEmptyExtension();
|
| +scoped_refptr<extensions::Extension> CreateEmptyExtension();
|
|
|
| // Creates an extension instance with a specified location that can be attached
|
| // to an ExtensionFunction before running.
|
| -scoped_refptr<Extension> CreateEmptyExtensionWithLocation(
|
| - Extension::Location location);
|
| +scoped_refptr<extensions::Extension> CreateEmptyExtensionWithLocation(
|
| + extensions::Extension::Location location);
|
|
|
| enum RunFunctionFlags {
|
| NONE = 0,
|
|
|