From 1d5e58b96403aab76b4ae9f957eac7fac9c54182 Mon Sep 17 00:00:00 2001 From: "yoz@chromium.org" Date: Thu, 31 Jan 2013 08:41:40 +0000 Subject: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. Reverses the dependency between Extension and Manifest. Part 1 of moving Manifest to top-level extensions. BUG=162530 TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/12093036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179828 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/extensions/extension_function_test_utils.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'chrome/browser/extensions/extension_function_test_utils.cc') diff --git a/chrome/browser/extensions/extension_function_test_utils.cc b/chrome/browser/extensions/extension_function_test_utils.cc index d352966..157600b 100644 --- a/chrome/browser/extensions/extension_function_test_utils.cc +++ b/chrome/browser/extensions/extension_function_test_utils.cc @@ -19,6 +19,7 @@ using content::WebContents; using extensions::Extension; +using extensions::Manifest; namespace keys = extensions::tabs_constants; namespace { @@ -102,11 +103,11 @@ base::ListValue* ToList(base::Value* val) { } scoped_refptr CreateEmptyExtension() { - return CreateEmptyExtensionWithLocation(Extension::INTERNAL); + return CreateEmptyExtensionWithLocation(Manifest::INTERNAL); } scoped_refptr CreateEmptyExtensionWithLocation( - Extension::Location location) { + Manifest::Location location) { scoped_ptr test_extension_value( ParseDictionary("{\"name\": \"Test\", \"version\": \"1.0\"}")); return CreateExtension(location, test_extension_value.get(), std::string()); @@ -116,18 +117,18 @@ scoped_refptr CreateEmptyExtension( const std::string& id_input) { scoped_ptr test_extension_value( ParseDictionary("{\"name\": \"Test\", \"version\": \"1.0\"}")); - return CreateExtension(Extension::INTERNAL, test_extension_value.get(), + return CreateExtension(Manifest::INTERNAL, test_extension_value.get(), id_input); } scoped_refptr CreateExtension( base::DictionaryValue* test_extension_value) { - return CreateExtension(Extension::INTERNAL, test_extension_value, + return CreateExtension(Manifest::INTERNAL, test_extension_value, std::string()); } scoped_refptr CreateExtension( - Extension::Location location, + Manifest::Location location, base::DictionaryValue* test_extension_value, const std::string& id_input) { std::string error; -- cgit v1.1