diff options
Diffstat (limited to 'chrome/common/extensions')
51 files changed, 192 insertions, 123 deletions
diff --git a/chrome/common/extensions/api/extension_api.h b/chrome/common/extensions/api/extension_api.h index cbbdaad..9cfba19 100644 --- a/chrome/common/extensions/api/extension_api.h +++ b/chrome/common/extensions/api/extension_api.h @@ -27,11 +27,11 @@ class Value; } class GURL; -class Extension; class ExtensionPermissionSet; namespace extensions { +class Extension; class Feature; // C++ Wrapper for the JSON API definitions in chrome/common/extensions/api/. diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index 0c88438..539e238 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -59,6 +59,8 @@ namespace switch_utils = extensions::switch_utils; using extensions::csp_validator::ContentSecurityPolicyIsLegal; using extensions::csp_validator::ContentSecurityPolicyIsSecure; +namespace extensions { + namespace { const int kModernManifestVersion = 1; @@ -3560,3 +3562,5 @@ UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo( : reason(reason), extension(extension), permissions(permissions) {} + +} // namespace extensions diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h index 5e7df6f..2e68ab1 100644 --- a/chrome/common/extensions/extension.h +++ b/chrome/common/extensions/extension.h @@ -42,14 +42,16 @@ class DictionaryValue; class ListValue; } -namespace extensions { -class Manifest; -} - namespace webkit_glue { struct WebIntentServiceData; } +FORWARD_DECLARE_TEST(TabStripModelTest, Apps); + +namespace extensions { + +class Manifest; + // Represents a Chrome extension. class Extension : public base::RefCountedThreadSafe<Extension> { public: @@ -1062,7 +1064,7 @@ class Extension : public base::RefCountedThreadSafe<Extension> { std::string content_security_policy_; FRIEND_TEST_ALL_PREFIXES(ExtensionTest, LoadPageActionHelper); - FRIEND_TEST_ALL_PREFIXES(TabStripModelTest, Apps); + FRIEND_TEST_ALL_PREFIXES(::TabStripModelTest, Apps); DISALLOW_COPY_AND_ASSIGN(Extension); }; @@ -1124,4 +1126,6 @@ struct UpdatedExtensionPermissionsInfo { Reason reason); }; +} // namespace extensions + #endif // CHROME_COMMON_EXTENSIONS_EXTENSION_H_ diff --git a/chrome/common/extensions/extension_file_util.cc b/chrome/common/extensions/extension_file_util.cc index 848625e..ec72db7 100644 --- a/chrome/common/extensions/extension_file_util.cc +++ b/chrome/common/extensions/extension_file_util.cc @@ -29,12 +29,15 @@ #include "net/base/file_stream.h" #include "ui/base/l10n/l10n_util.h" +using extensions::Extension; + namespace errors = extension_manifest_errors; namespace extension_file_util { // Validates locale info. Doesn't check if messages.json files are valid. -static bool ValidateLocaleInfo(const Extension& extension, std::string* error); +static bool ValidateLocaleInfo(const Extension& extension, + std::string* error); // Returns false and sets the error if script file can't be loaded, // or if it's not UTF-8 encoded. @@ -124,8 +127,7 @@ scoped_refptr<Extension> LoadExtension(const FilePath& extension_path, Extension::Location location, int flags, std::string* error) { - return LoadExtension( - extension_path, std::string(), location, flags, error); + return LoadExtension(extension_path, std::string(), location, flags, error); } scoped_refptr<Extension> LoadExtension(const FilePath& extension_path, @@ -140,13 +142,12 @@ scoped_refptr<Extension> LoadExtension(const FilePath& extension_path, error)) return NULL; - scoped_refptr<Extension> extension(Extension::Create( - extension_path, - location, - *manifest, - flags, - extension_id, - error)); + scoped_refptr<Extension> extension(Extension::Create(extension_path, + location, + *manifest, + flags, + extension_id, + error)); if (!extension.get()) return NULL; @@ -190,7 +191,8 @@ DictionaryValue* LoadManifest(const FilePath& extension_path, return static_cast<DictionaryValue*>(root.release()); } -bool ValidateExtension(const Extension* extension, std::string* error) { +bool ValidateExtension(const Extension* extension, + std::string* error) { // Validate icons exist. for (ExtensionIconSet::IconMap::const_iterator iter = extension->icons().map().begin(); @@ -435,7 +437,8 @@ ExtensionMessageBundle* LoadExtensionMessageBundle( std::string* error) { error->clear(); // Load locale information if available. - FilePath locale_path = extension_path.Append(Extension::kLocaleFolder); + FilePath locale_path = extension_path.Append( + Extension::kLocaleFolder); if (!file_util::PathExists(locale_path)) return NULL; @@ -484,9 +487,11 @@ SubstitutionMap* LoadExtensionMessageBundleSubstitutionMap( return returnValue; } -static bool ValidateLocaleInfo(const Extension& extension, std::string* error) { +static bool ValidateLocaleInfo(const Extension& extension, + std::string* error) { // default_locale and _locales have to be both present or both missing. - const FilePath path = extension.path().Append(Extension::kLocaleFolder); + const FilePath path = extension.path().Append( + Extension::kLocaleFolder); bool path_exists = file_util::PathExists(path); std::string default_locale = extension.default_locale(); diff --git a/chrome/common/extensions/extension_file_util.h b/chrome/common/extensions/extension_file_util.h index 1ad1120..96f38fb 100644 --- a/chrome/common/extensions/extension_file_util.h +++ b/chrome/common/extensions/extension_file_util.h @@ -12,7 +12,6 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_message_bundle.h" -class Extension; class ExtensionMessageBundle; class FilePath; class GURL; @@ -41,17 +40,19 @@ void UninstallExtension(const FilePath& extensions_dir, // Loads and validates an extension from the specified directory. Returns NULL // on failure, with a description of the error in |error|. -scoped_refptr<Extension> LoadExtension(const FilePath& extension_root, - Extension::Location location, - int flags, - std::string* error); +scoped_refptr<extensions::Extension> LoadExtension( + const FilePath& extension_root, + extensions::Extension::Location location, + int flags, + std::string* error); // The same as LoadExtension except use the provided |extension_id|. -scoped_refptr<Extension> LoadExtension(const FilePath& extension_root, - const std::string& extension_id, - Extension::Location location, - int flags, - std::string* error); +scoped_refptr<extensions::Extension> LoadExtension( + const FilePath& extension_root, + const std::string& extension_id, + extensions::Extension::Location location, + int flags, + std::string* error); // Loads an extension manifest from the specified directory. Returns NULL // on failure, with a description of the error in |error|. @@ -60,7 +61,8 @@ base::DictionaryValue* LoadManifest(const FilePath& extension_root, // Returns true if the given extension object is valid and consistent. // Otherwise, a description of the error is returned in |error|. -bool ValidateExtension(const Extension* extension, std::string* error); +bool ValidateExtension(const extensions::Extension* extension, + std::string* error); // Cleans up the extension install directory. It can end up with garbage in it // if extensions can't initially be removed when they are uninstalled (eg if a diff --git a/chrome/common/extensions/extension_file_util_unittest.cc b/chrome/common/extensions/extension_file_util_unittest.cc index eef0a63..04d8b91 100644 --- a/chrome/common/extensions/extension_file_util_unittest.cc +++ b/chrome/common/extensions/extension_file_util_unittest.cc @@ -17,6 +17,8 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" +using extensions::Extension; + namespace keys = extension_manifest_keys; #if defined(OS_WIN) diff --git a/chrome/common/extensions/extension_l10n_util.cc b/chrome/common/extensions/extension_l10n_util.cc index 117ac74..1fa88e7 100644 --- a/chrome/common/extensions/extension_l10n_util.cc +++ b/chrome/common/extensions/extension_l10n_util.cc @@ -48,7 +48,7 @@ std::string GetDefaultLocaleFromManifest(const DictionaryValue& manifest, } -bool ShouldRelocalizeManifest(const ExtensionInfo& info) { +bool ShouldRelocalizeManifest(const extensions::ExtensionInfo& info) { DictionaryValue* manifest = info.extension_manifest.get(); if (!manifest) return false; @@ -206,7 +206,7 @@ bool AddLocale(const std::set<std::string>& chrome_locales, } // Check if messages file is actually present (but don't check content). if (file_util::PathExists( - locale_folder.Append(Extension::kMessagesFilename))) { + locale_folder.Append(extensions::Extension::kMessagesFilename))) { valid_locales->insert(locale_name); } else { *error = base::StringPrintf("Catalog file is missing for locale %s.", @@ -279,7 +279,7 @@ static DictionaryValue* LoadMessageFile(const FilePath& locale_path, std::string* error) { std::string extension_locale = locale; FilePath file = locale_path.AppendASCII(extension_locale) - .Append(Extension::kMessagesFilename); + .Append(extensions::Extension::kMessagesFilename); JSONFileValueSerializer messages_serializer(file); Value *dictionary = messages_serializer.Deserialize(NULL, error); if (!dictionary && error->empty()) { diff --git a/chrome/common/extensions/extension_l10n_util.h b/chrome/common/extensions/extension_l10n_util.h index 8b08e4a..e96a858 100644 --- a/chrome/common/extensions/extension_l10n_util.h +++ b/chrome/common/extensions/extension_l10n_util.h @@ -12,15 +12,17 @@ #include <string> #include <vector> -class Extension; class ExtensionMessageBundle; class FilePath; -struct ExtensionInfo; namespace base { class DictionaryValue; } +namespace extensions { +struct ExtensionInfo; +} + namespace extension_l10n_util { // Set the locale for this process to a fixed value, rather than using the @@ -35,7 +37,7 @@ std::string GetDefaultLocaleFromManifest(const base::DictionaryValue& manifest, // Returns true iff the extension was localized, and the current locale // doesn't match the locale written into info.extension_manifest. -bool ShouldRelocalizeManifest(const ExtensionInfo& info); +bool ShouldRelocalizeManifest(const extensions::ExtensionInfo& info); // Localize extension name, description, browser_action and other fields // in the manifest. diff --git a/chrome/common/extensions/extension_l10n_util_unittest.cc b/chrome/common/extensions/extension_l10n_util_unittest.cc index 182875e..5e0b46a 100644 --- a/chrome/common/extensions/extension_l10n_util_unittest.cc +++ b/chrome/common/extensions/extension_l10n_util_unittest.cc @@ -17,6 +17,9 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" +using extensions::Extension; +using extensions::ExtensionInfo; + namespace errors = extension_manifest_errors; namespace keys = extension_manifest_keys; diff --git a/chrome/common/extensions/extension_messages.cc b/chrome/common/extensions/extension_messages.cc index 838943d..db167d1 100644 --- a/chrome/common/extensions/extension_messages.cc +++ b/chrome/common/extensions/extension_messages.cc @@ -4,10 +4,13 @@ #include "chrome/common/extensions/extension_messages.h" +#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/manifest.h" #include "content/public/common/common_param_traits.h" +using extensions::Extension; + ExtensionMsg_Loaded_Params::ExtensionMsg_Loaded_Params() : location(Extension::INVALID), creation_flags(Extension::NO_FLAGS){} diff --git a/chrome/common/extensions/extension_messages.h b/chrome/common/extensions/extension_messages.h index 4b634a6..0c40ec9 100644 --- a/chrome/common/extensions/extension_messages.h +++ b/chrome/common/extensions/extension_messages.h @@ -103,16 +103,16 @@ typedef std::map<std::string, std::string> SubstitutionMap; struct ExtensionMsg_Loaded_Params { ExtensionMsg_Loaded_Params(); ~ExtensionMsg_Loaded_Params(); - explicit ExtensionMsg_Loaded_Params(const Extension* extension); + explicit ExtensionMsg_Loaded_Params(const extensions::Extension* extension); // Creates a new extension from the data in this object. - scoped_refptr<Extension> ConvertToExtension() const; + scoped_refptr<extensions::Extension> ConvertToExtension() const; // The subset of the extension manifest data we send to renderers. linked_ptr<DictionaryValue> manifest; // The location the extension was installed from. - Extension::Location location; + extensions::Extension::Location location; // The path the extension was loaded from. This is used in the renderer only // to generate the extension ID for extensions that are loaded unpacked. @@ -214,7 +214,8 @@ IPC_MESSAGE_CONTROL1(ExtensionMsg_Unloaded, // Updates the scripting whitelist for extensions in the render process. This is // only used for testing. IPC_MESSAGE_CONTROL1(ExtensionMsg_SetScriptingWhitelist, - Extension::ScriptingWhitelist /* extenison ids */) + // extension ids + extensions::Extension::ScriptingWhitelist) // Notification that renderer should run some JavaScript code. IPC_MESSAGE_ROUTED1(ExtensionMsg_ExecuteCode, diff --git a/chrome/common/extensions/extension_permission_set.cc b/chrome/common/extensions/extension_permission_set.cc index d1d5b55..c456146 100644 --- a/chrome/common/extensions/extension_permission_set.cc +++ b/chrome/common/extensions/extension_permission_set.cc @@ -452,7 +452,7 @@ ExtensionAPIPermission* ExtensionPermissionsInfo::RegisterPermission( ExtensionPermissionSet::ExtensionPermissionSet() {} ExtensionPermissionSet::ExtensionPermissionSet( - const Extension* extension, + const extensions::Extension* extension, const ExtensionAPIPermissionSet& apis, const URLPatternSet& explicit_hosts, const ExtensionOAuth2Scopes& scopes) @@ -869,7 +869,7 @@ std::set<std::string> ExtensionPermissionSet::GetDistinctHosts( } void ExtensionPermissionSet::InitImplicitExtensionPermissions( - const Extension* extension) { + const extensions::Extension* extension) { // Add the implied permissions. if (!extension->plugins().empty()) apis_.insert(ExtensionAPIPermission::kPlugin); diff --git a/chrome/common/extensions/extension_permission_set.h b/chrome/common/extensions/extension_permission_set.h index a0165e4..02011a0 100644 --- a/chrome/common/extensions/extension_permission_set.h +++ b/chrome/common/extensions/extension_permission_set.h @@ -19,9 +19,12 @@ // TODO(jstritar): Move each class to its own file in extensions/permissions. -class Extension; class ExtensionPermissionsInfo; +namespace extensions { +class Extension; +} + // When prompting the user to install or approve permissions, we display // messages describing the effects of the permissions rather than listing the // permissions themselves. Each ExtensionPermissionMessage represents one of the @@ -290,7 +293,7 @@ class ExtensionPermissionSet // the api and host permissions (|apis| and |hosts|). The effective hosts // of the newly created permission set will be inferred from the |extension| // manifest, |apis| and |hosts|. - ExtensionPermissionSet(const Extension* extension, + ExtensionPermissionSet(const extensions::Extension* extension, const ExtensionAPIPermissionSet& apis, const URLPatternSet& explicit_hosts, const ExtensionOAuth2Scopes& scopes); @@ -411,7 +414,7 @@ class ExtensionPermissionSet bool exclude_file_scheme); // Initializes the set based on |extension|'s manifest data. - void InitImplicitExtensionPermissions(const Extension* extension); + void InitImplicitExtensionPermissions(const extensions::Extension* extension); // Initializes the effective host permission based on the data in this set. void InitEffectiveHosts(); diff --git a/chrome/common/extensions/extension_permission_set_unittest.cc b/chrome/common/extensions/extension_permission_set_unittest.cc index dfd8ca8..dd85c5c 100644 --- a/chrome/common/extensions/extension_permission_set_unittest.cc +++ b/chrome/common/extensions/extension_permission_set_unittest.cc @@ -17,6 +17,8 @@ #include "chrome/common/extensions/extension_permission_set.h" #include "testing/gtest/include/gtest/gtest.h" +using extensions::Extension; + namespace errors = extension_manifest_errors; namespace keys = extension_manifest_keys; namespace values = extension_manifest_values; diff --git a/chrome/common/extensions/extension_process_policy.cc b/chrome/common/extensions/extension_process_policy.cc index edadd0f..15a173a 100644 --- a/chrome/common/extensions/extension_process_policy.cc +++ b/chrome/common/extensions/extension_process_policy.cc @@ -8,10 +8,11 @@ namespace extensions { -const Extension* GetNonBookmarkAppExtension( +const extensions::Extension* GetNonBookmarkAppExtension( const ExtensionSet& extensions, const ExtensionURLInfo& url) { // Exclude bookmark apps, which do not use the app process model. - const Extension* extension = extensions.GetExtensionOrAppByURL(url); + const extensions::Extension* extension = + extensions.GetExtensionOrAppByURL(url); if (extension && extension->from_bookmark()) extension = NULL; return extension; @@ -21,10 +22,12 @@ bool CrossesExtensionProcessBoundary( const ExtensionSet& extensions, const ExtensionURLInfo& old_url, const ExtensionURLInfo& new_url) { - const Extension* old_url_extension = GetNonBookmarkAppExtension(extensions, - old_url); - const Extension* new_url_extension = GetNonBookmarkAppExtension(extensions, - new_url); + const extensions::Extension* old_url_extension = GetNonBookmarkAppExtension( + extensions, + old_url); + const extensions::Extension* new_url_extension = GetNonBookmarkAppExtension( + extensions, + new_url); // TODO(creis): Temporary workaround for crbug.com/59285: Do not swap process // to navigate from a hosted app to a normal page or another hosted app diff --git a/chrome/common/extensions/extension_process_policy.h b/chrome/common/extensions/extension_process_policy.h index a2fc6f2..85f9eef 100644 --- a/chrome/common/extensions/extension_process_policy.h +++ b/chrome/common/extensions/extension_process_policy.h @@ -6,12 +6,13 @@ #define CHROME_COMMON_EXTENSIONS_EXTENSION_PROCESS_POLICY_H_ #pragma once -class Extension; class ExtensionSet; class ExtensionURLInfo; namespace extensions { +class Extension; + // Returns the extension for the given URL. Excludes extension objects for // bookmark apps, which do not use the app process model. const Extension* GetNonBookmarkAppExtension(const ExtensionSet& extensions, diff --git a/chrome/common/extensions/extension_resource_unittest.cc b/chrome/common/extensions/extension_resource_unittest.cc index 9b3e2d0..67c9ebd 100644 --- a/chrome/common/extensions/extension_resource_unittest.cc +++ b/chrome/common/extensions/extension_resource_unittest.cc @@ -116,7 +116,7 @@ TEST(ExtensionResourceTest, CreateWithAllResourcesOnDisk) { ASSERT_TRUE(file_util::WriteFile(root_resource, data.c_str(), data.length())); // Create l10n resources (for current locale and its parents). - FilePath l10n_path = temp.path().Append(Extension::kLocaleFolder); + FilePath l10n_path = temp.path().Append(extensions::Extension::kLocaleFolder); ASSERT_TRUE(file_util::CreateDirectory(l10n_path)); std::vector<std::string> locales; diff --git a/chrome/common/extensions/extension_set.cc b/chrome/common/extensions/extension_set.cc index f5aee9f..1eb931c 100644 --- a/chrome/common/extensions/extension_set.cc +++ b/chrome/common/extensions/extension_set.cc @@ -5,9 +5,11 @@ #include "chrome/common/extensions/extension_set.h" #include "base/logging.h" +#include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" using WebKit::WebSecurityOrigin; +using extensions::Extension; ExtensionURLInfo::ExtensionURLInfo(WebSecurityOrigin origin, const GURL& url) : origin_(origin), diff --git a/chrome/common/extensions/extension_set.h b/chrome/common/extensions/extension_set.h index 9d46373..428df7f 100644 --- a/chrome/common/extensions/extension_set.h +++ b/chrome/common/extensions/extension_set.h @@ -41,15 +41,16 @@ class ExtensionURLInfo { // The one true extension container. Extensions are identified by their id. // Only one extension can be in the set with a given ID. class ExtensionSet { - public: +public: typedef std::pair<FilePath, std::string> ExtensionPathAndDefaultLocale; - typedef std::map<std::string, scoped_refptr<const Extension> > ExtensionMap; + typedef std::map<std::string, scoped_refptr<const extensions::Extension> > + ExtensionMap; // Iteration over the values of the map (given that it's an ExtensionSet, // it should iterate like a set iterator). class const_iterator : public std::iterator<std::input_iterator_tag, - scoped_refptr<const Extension> > { + scoped_refptr<const extensions::Extension> > { public: const_iterator() {} explicit const_iterator(ExtensionMap::const_iterator it) : @@ -58,7 +59,7 @@ class ExtensionSet { ++it_; return *this; } - const scoped_refptr<const Extension> operator*() { + const scoped_refptr<const extensions::Extension> operator*() { return it_->second; } bool operator!=(const const_iterator& other) { return it_ != other.it_; } @@ -83,7 +84,7 @@ class ExtensionSet { // Adds the specified extension to the set. The set becomes an owner. Any // previous extension with the same ID is removed. - void Insert(const scoped_refptr<const Extension>& extension); + void Insert(const scoped_refptr<const extensions::Extension>& extension); // Copies different items from |extensions| to the current set and returns // whether anything changed. @@ -104,14 +105,16 @@ class ExtensionSet { // NOTE: This can return NULL if called before UpdateExtensions receives // bulk extension data (e.g. if called from // EventBindings::HandleContextCreated) - const Extension* GetExtensionOrAppByURL(const ExtensionURLInfo& info) const; + const extensions::Extension* GetExtensionOrAppByURL( + const ExtensionURLInfo& info) const; // Returns the hosted app whose web extent contains the URL. - const Extension* GetHostedAppByURL(const ExtensionURLInfo& info) const; + const extensions::Extension* GetHostedAppByURL( + const ExtensionURLInfo& info) const; // Returns a hosted app that contains any URL that overlaps with the given // extent, if one exists. - const Extension* GetHostedAppByOverlappingWebExtent( + const extensions::Extension* GetHostedAppByOverlappingWebExtent( const URLPatternSet& extent) const; // Returns true if |new_url| is in the extent of the same extension as @@ -119,7 +122,7 @@ class ExtensionSet { bool InSameExtent(const GURL& old_url, const GURL& new_url) const; // Look up an Extension object by id. - const Extension* GetByID(const std::string& id) const; + const extensions::Extension* GetByID(const std::string& id) const; // Returns true if |info| should get extension api bindings and be permitted // to make api calls. Note that this is independent of what extension diff --git a/chrome/common/extensions/extension_set_unittest.cc b/chrome/common/extensions/extension_set_unittest.cc index 37e5559..5d73d305 100644 --- a/chrome/common/extensions/extension_set_unittest.cc +++ b/chrome/common/extensions/extension_set_unittest.cc @@ -11,6 +11,8 @@ #include "chrome/common/extensions/extension_set.h" #include "testing/gtest/include/gtest/gtest.h" +using extensions::Extension; + namespace { scoped_refptr<Extension> CreateTestExtension(const std::string& name, diff --git a/chrome/common/extensions/extension_test_util.cc b/chrome/common/extensions/extension_test_util.cc index 31f3af2..fc6562f 100644 --- a/chrome/common/extensions/extension_test_util.cc +++ b/chrome/common/extensions/extension_test_util.cc @@ -10,10 +10,10 @@ namespace extension_test_util { std::string MakeId(std::string seed) { std::string result; - bool success = Extension::GenerateId(seed, &result); + bool success = extensions::Extension::GenerateId(seed, &result); EXPECT_TRUE(success); EXPECT_FALSE(result.empty()); - EXPECT_TRUE(Extension::IdIsValid(result)); + EXPECT_TRUE(extensions::Extension::IdIsValid(result)); return result; } diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc index b72176c..9094670 100644 --- a/chrome/common/extensions/extension_unittest.cc +++ b/chrome/common/extensions/extension_unittest.cc @@ -27,6 +27,8 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/png_codec.h" +using extensions::Extension; + namespace keys = extension_manifest_keys; namespace values = extension_manifest_values; namespace errors = extension_manifest_errors; diff --git a/chrome/common/extensions/extension_unpacker.cc b/chrome/common/extensions/extension_unpacker.cc index 9e26808..5194b4b 100644 --- a/chrome/common/extensions/extension_unpacker.cc +++ b/chrome/common/extensions/extension_unpacker.cc @@ -86,7 +86,7 @@ bool PathContainsParentDirectory(const FilePath& path) { ExtensionUnpacker::ExtensionUnpacker(const FilePath& extension_path, const std::string& extension_id, - Extension::Location location, + extensions::Extension::Location location, int creation_flags) : extension_path_(extension_path), extension_id_(extension_id), @@ -99,7 +99,7 @@ ExtensionUnpacker::~ExtensionUnpacker() { DictionaryValue* ExtensionUnpacker::ReadManifest() { FilePath manifest_path = - temp_install_dir_.Append(Extension::kManifestFilename); + temp_install_dir_.Append(extensions::Extension::kManifestFilename); if (!file_util::PathExists(manifest_path)) { SetError(errors::kInvalidManifest); return NULL; @@ -124,7 +124,7 @@ DictionaryValue* ExtensionUnpacker::ReadManifest() { bool ExtensionUnpacker::ReadAllMessageCatalogs( const std::string& default_locale) { FilePath locales_path = - temp_install_dir_.Append(Extension::kLocaleFolder); + temp_install_dir_.Append(extensions::Extension::kLocaleFolder); // Not all folders under _locales have to be valid locales. file_util::FileEnumerator locales(locales_path, @@ -140,7 +140,7 @@ bool ExtensionUnpacker::ReadAllMessageCatalogs( continue; FilePath messages_path = - locale_path.Append(Extension::kMessagesFilename); + locale_path.Append(extensions::Extension::kMessagesFilename); if (!ReadMessageCatalog(messages_path)) return false; @@ -178,7 +178,7 @@ bool ExtensionUnpacker::Run() { return false; // Error was already reported. std::string error; - scoped_refptr<Extension> extension(Extension::Create( + scoped_refptr<extensions::Extension> extension(extensions::Extension::Create( temp_install_dir_, location_, *parsed_manifest_, diff --git a/chrome/common/extensions/extension_unpacker.h b/chrome/common/extensions/extension_unpacker.h index 5c6c14c..5fd7398 100644 --- a/chrome/common/extensions/extension_unpacker.h +++ b/chrome/common/extensions/extension_unpacker.h @@ -30,7 +30,7 @@ class ExtensionUnpacker { ExtensionUnpacker(const FilePath& extension_path, const std::string& extension_id, - Extension::Location location, + extensions::Extension::Location location, int creation_flags); ~ExtensionUnpacker(); @@ -93,7 +93,7 @@ class ExtensionUnpacker { std::string extension_id_; // The location to use for the created extension. - Extension::Location location_; + extensions::Extension::Location location_; // The creation flags to use with the created extension. int creation_flags_; diff --git a/chrome/common/extensions/extension_unpacker_unittest.cc b/chrome/common/extensions/extension_unpacker_unittest.cc index 4c43a7b..64d08f6 100644 --- a/chrome/common/extensions/extension_unpacker_unittest.cc +++ b/chrome/common/extensions/extension_unpacker_unittest.cc @@ -43,8 +43,10 @@ public: ", Crx path " << crx_path.value(); unpacker_.reset( - new ExtensionUnpacker( - crx_path, std::string(), Extension::INTERNAL, Extension::NO_FLAGS)); + new ExtensionUnpacker(crx_path, + std::string(), + extensions::Extension::INTERNAL, + extensions::Extension::NO_FLAGS)); } protected: diff --git a/chrome/common/extensions/feature.cc b/chrome/common/extensions/feature.cc index fabdc04..594a64e 100644 --- a/chrome/common/extensions/feature.cc +++ b/chrome/common/extensions/feature.cc @@ -12,6 +12,7 @@ #include "chrome/common/chrome_switches.h" using chrome::VersionInfo; +using extensions::Extension; namespace { diff --git a/chrome/common/extensions/feature_unittest.cc b/chrome/common/extensions/feature_unittest.cc index 1be05f3..a046124 100644 --- a/chrome/common/extensions/feature_unittest.cc +++ b/chrome/common/extensions/feature_unittest.cc @@ -7,6 +7,7 @@ #include "testing/gtest/include/gtest/gtest.h" using chrome::VersionInfo; +using extensions::Extension; using extensions::Feature; namespace { diff --git a/chrome/common/extensions/manifest_tests/extension_manifest_test.cc b/chrome/common/extensions/manifest_tests/extension_manifest_test.cc index 3237e2b..caef6c3 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifest_test.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifest_test.cc @@ -14,6 +14,8 @@ #include "chrome/common/extensions/extension_l10n_util.h" #include "ui/base/l10n/l10n_util.h" +using extensions::Extension; + ExtensionManifestTest::ExtensionManifestTest() : enable_apps_(true) {} // static diff --git a/chrome/common/extensions/manifest_tests/extension_manifest_test.h b/chrome/common/extensions/manifest_tests/extension_manifest_test.h index f2222ad..b125dfa 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifest_test.h +++ b/chrome/common/extensions/manifest_tests/extension_manifest_test.h @@ -54,36 +54,41 @@ class ExtensionManifestTest : public testing::Test { mutable scoped_ptr<DictionaryValue> manifest_holder_; }; - scoped_refptr<Extension> LoadExtension( + scoped_refptr<extensions::Extension> LoadExtension( const Manifest& manifest, std::string* error, - Extension::Location location = Extension::INTERNAL, - int flags = Extension::NO_FLAGS); + extensions::Extension::Location location = + extensions::Extension::INTERNAL, + int flags = extensions::Extension::NO_FLAGS); - scoped_refptr<Extension> LoadAndExpectSuccess( + scoped_refptr<extensions::Extension> LoadAndExpectSuccess( const Manifest& manifest, - Extension::Location location = Extension::INTERNAL, - int flags = Extension::NO_FLAGS); + extensions::Extension::Location location = + extensions::Extension::INTERNAL, + int flags = extensions::Extension::NO_FLAGS); - scoped_refptr<Extension> LoadAndExpectSuccess( + scoped_refptr<extensions::Extension> LoadAndExpectSuccess( char const* manifest_name, - Extension::Location location = Extension::INTERNAL, - int flags = Extension::NO_FLAGS); + extensions::Extension::Location location = + extensions::Extension::INTERNAL, + int flags = extensions::Extension::NO_FLAGS); - void VerifyExpectedError(Extension* extension, + void VerifyExpectedError(extensions::Extension* extension, const std::string& name, const std::string& error, const std::string& expected_error); void LoadAndExpectError(char const* manifest_name, const std::string& expected_error, - Extension::Location location = Extension::INTERNAL, - int flags = Extension::NO_FLAGS); + extensions::Extension::Location location = + extensions::Extension::INTERNAL, + int flags = extensions::Extension::NO_FLAGS); void LoadAndExpectError(const Manifest& manifest, const std::string& expected_error, - Extension::Location location = Extension::INTERNAL, - int flags = Extension::NO_FLAGS); + extensions::Extension::Location location = + extensions::Extension::INTERNAL, + int flags = extensions::Extension::NO_FLAGS); void AddPattern(URLPatternSet* extent, const std::string& pattern); @@ -94,18 +99,19 @@ class ExtensionManifestTest : public testing::Test { struct Testcase { std::string manifest_filename_; std::string expected_error_; // only used for ExpectedError tests - Extension::Location location_; + extensions::Extension::Location location_; int flags_; Testcase(std::string manifest_filename, std::string expected_error, - Extension::Location location, int flags); + extensions::Extension::Location location, int flags); Testcase(std::string manifest_filename, std::string expected_error); explicit Testcase(std::string manifest_filename); - Testcase(std::string manifest_filename, Extension::Location location, - int flags); + Testcase(std::string manifest_filename, + extensions::Extension::Location location, + int flags); }; void RunTestcases(const Testcase* testcases, size_t num_testcases, diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc index e9e329e..691c477 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc @@ -21,7 +21,7 @@ TEST_F(ExtensionManifestTest, ChromeResourcesPermissionValidOnlyForComponents) { std::string error; LoadExtension(Manifest("permission_chrome_resources_url.json"), &error, - Extension::COMPONENT, - Extension::STRICT_ERROR_CHECKS); + extensions::Extension::COMPONENT, + extensions::Extension::STRICT_ERROR_CHECKS); EXPECT_EQ("", error); } diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_default_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_default_unittest.cc index 5152bbf..959a161 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_default_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_default_unittest.cc @@ -11,7 +11,7 @@ namespace errors = extension_manifest_errors; TEST_F(ExtensionManifestTest, DefaultPathForExtent) { - scoped_refptr<Extension> extension( + scoped_refptr<extensions::Extension> extension( LoadAndExpectSuccess("default_path_for_extent.json")); ASSERT_EQ(1u, extension->web_extent().patterns().size()); @@ -24,7 +24,7 @@ TEST_F(ExtensionManifestTest, DefaultLocale) { LoadAndExpectError("default_locale_invalid.json", errors::kInvalidDefaultLocale); - scoped_refptr<Extension> extension( + scoped_refptr<extensions::Extension> extension( LoadAndExpectSuccess("default_locale_valid.json")); EXPECT_EQ("de-AT", extension->default_locale()); } diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_devtools_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_devtools_unittest.cc index 5e027b5..4ee81e7 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_devtools_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_devtools_unittest.cc @@ -14,7 +14,7 @@ TEST_F(ExtensionManifestTest, DevToolsExtensions) { LoadAndExpectError("devtools_extension_url_invalid_type.json", errors::kInvalidDevToolsPage); - scoped_refptr<Extension> extension; + scoped_refptr<extensions::Extension> extension; extension = LoadAndExpectSuccess("devtools_extension.json"); EXPECT_EQ(extension->url().spec() + "devtools.html", extension->devtools_url().spec()); diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_experimental_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_experimental_unittest.cc index 57b7f7d..4fe31c4 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_experimental_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_experimental_unittest.cc @@ -14,9 +14,9 @@ namespace errors = extension_manifest_errors; TEST_F(ExtensionManifestTest, ExperimentalPermission) { LoadAndExpectError("experimental.json", errors::kExperimentalFlagRequired); - LoadAndExpectSuccess("experimental.json", Extension::COMPONENT); - LoadAndExpectSuccess("experimental.json", Extension::INTERNAL, - Extension::FROM_WEBSTORE); + LoadAndExpectSuccess("experimental.json", extensions::Extension::COMPONENT); + LoadAndExpectSuccess("experimental.json", extensions::Extension::INTERNAL, + extensions::Extension::FROM_WEBSTORE); CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); LoadAndExpectSuccess("experimental.json"); diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_filebrowser_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_filebrowser_unittest.cc index eaa227c..3668d35 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_filebrowser_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_filebrowser_unittest.cc @@ -11,6 +11,8 @@ #include "chrome/common/extensions/file_browser_handler.h" #include "testing/gtest/include/gtest/gtest.h" +using extensions::Extension; + namespace errors = extension_manifest_errors; TEST_F(ExtensionManifestTest, FileBrowserHandlers) { diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_homepage_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_homepage_unittest.cc index 66c3c42..59836af 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_homepage_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_homepage_unittest.cc @@ -12,7 +12,7 @@ namespace errors = extension_manifest_errors; TEST_F(ExtensionManifestTest, ParseHomepageURLs) { - scoped_refptr<Extension> extension( + scoped_refptr<extensions::Extension> extension( LoadAndExpectSuccess("homepage_valid.json")); Testcase testcases[] = { @@ -28,7 +28,7 @@ TEST_F(ExtensionManifestTest, ParseHomepageURLs) { } TEST_F(ExtensionManifestTest, GetHomepageURL) { - scoped_refptr<Extension> extension( + scoped_refptr<extensions::Extension> extension( LoadAndExpectSuccess("homepage_valid.json")); EXPECT_EQ(GURL("http://foo.com#bar"), extension->GetHomepageURL()); diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_icon_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_icon_unittest.cc index 4e9d570..23c05fd 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_icon_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_icon_unittest.cc @@ -8,7 +8,7 @@ #include "testing/gtest/include/gtest/gtest.h" TEST_F(ExtensionManifestTest, NormalizeIconPaths) { - scoped_refptr<Extension> extension( + scoped_refptr<extensions::Extension> extension( LoadAndExpectSuccess("normalize_icon_paths.json")); EXPECT_EQ("16.png", extension->icons().Get( ExtensionIconSet::EXTENSION_ICON_BITTY, ExtensionIconSet::MATCH_EXACTLY)); @@ -18,7 +18,7 @@ TEST_F(ExtensionManifestTest, NormalizeIconPaths) { } TEST_F(ExtensionManifestTest, InvalidIconSizes) { - scoped_refptr<Extension> extension( + scoped_refptr<extensions::Extension> extension( LoadAndExpectSuccess("init_ignored_icon_size.json")); EXPECT_EQ("", extension->icons().Get( static_cast<ExtensionIconSet::Icons>(300), @@ -26,7 +26,7 @@ TEST_F(ExtensionManifestTest, InvalidIconSizes) { } TEST_F(ExtensionManifestTest, ValidIconSizes) { - scoped_refptr<Extension> extension( + scoped_refptr<extensions::Extension> extension( LoadAndExpectSuccess("init_valid_icon_size.json")); EXPECT_EQ("16.png", extension->icons().Get( ExtensionIconSet::EXTENSION_ICON_BITTY, ExtensionIconSet::MATCH_EXACTLY)); diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc index 0840c87..588017b 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc @@ -74,14 +74,14 @@ TEST_F(ExtensionManifestTest, InitFromValueInvalid) { } TEST_F(ExtensionManifestTest, InitFromValueValid) { - scoped_refptr<Extension> extension(LoadAndExpectSuccess( + scoped_refptr<extensions::Extension> extension(LoadAndExpectSuccess( "init_valid_minimal.json")); FilePath path; PathService::Get(chrome::DIR_TEST_DATA, &path); path = path.AppendASCII("extensions"); - EXPECT_TRUE(Extension::IdIsValid(extension->id())); + EXPECT_TRUE(extensions::Extension::IdIsValid(extension->id())); EXPECT_EQ("1.0.0.0", extension->VersionString()); EXPECT_EQ("my extension", extension->name()); EXPECT_EQ(extension->id(), extension->url().host()); @@ -134,7 +134,7 @@ TEST_F(ExtensionManifestTest, InitFromValueValidNameInRTL) { #endif // No strong RTL characters in name. - scoped_refptr<Extension> extension(LoadAndExpectSuccess( + scoped_refptr<extensions::Extension> extension(LoadAndExpectSuccess( "init_valid_name_no_rtl.json")); string16 localized_name(ASCIIToUTF16("Dictionary (by Google)")); diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_isolatedapp_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_isolatedapp_unittest.cc index a93dbaf..6181ad0 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_isolatedapp_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_isolatedapp_unittest.cc @@ -19,7 +19,7 @@ TEST_F(ExtensionManifestTest, IsolatedApps) { CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); - scoped_refptr<Extension> extension2( + scoped_refptr<extensions::Extension> extension2( LoadAndExpectSuccess("isolated_app_valid.json")); EXPECT_TRUE(extension2->is_storage_isolated()); } diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_launch_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_launch_unittest.cc index 84cdf8d..35df234 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_launch_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_launch_unittest.cc @@ -14,7 +14,7 @@ namespace errors = extension_manifest_errors; TEST_F(ExtensionManifestTest, AppLaunchContainer) { - scoped_refptr<Extension> extension; + scoped_refptr<extensions::Extension> extension; extension = LoadAndExpectSuccess("launch_tab.json"); EXPECT_EQ(extension_misc::LAUNCH_TAB, extension->launch_container()); @@ -98,7 +98,7 @@ TEST_F(ExtensionManifestTest, AppLaunchURL) { RunTestcases(testcases, arraysize(testcases), EXPECT_TYPE_ERROR); - scoped_refptr<Extension> extension; + scoped_refptr<extensions::Extension> extension; extension = LoadAndExpectSuccess("launch_local_path.json"); EXPECT_EQ(extension->url().spec() + "launch.html", extension->GetFullLaunchURL().spec()); diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_offline_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_offline_unittest.cc index 9f7f031..7ec1c37 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_offline_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_offline_unittest.cc @@ -8,6 +8,8 @@ #include "chrome/common/extensions/extension_manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" +using extensions::Extension; + namespace errors = extension_manifest_errors; TEST_F(ExtensionManifestTest, OfflineEnabled) { diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_old_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_old_unittest.cc index 4664f89..bd590c5 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_old_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_old_unittest.cc @@ -10,10 +10,10 @@ // Tests that the old permission name "unlimited_storage" still works for // backwards compatibility (we renamed it to "unlimitedStorage"). TEST_F(ExtensionManifestTest, OldUnlimitedStoragePermission) { - scoped_refptr<Extension> extension = LoadAndExpectSuccess( + scoped_refptr<extensions::Extension> extension = LoadAndExpectSuccess( "old_unlimited_storage.json", - Extension::INTERNAL, - Extension::STRICT_ERROR_CHECKS); + extensions::Extension::INTERNAL, + extensions::Extension::STRICT_ERROR_CHECKS); EXPECT_TRUE(extension->HasAPIPermission( ExtensionAPIPermission::kUnlimitedStorage)); } diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_options_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_options_unittest.cc index 5853fda..2eef91d 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_options_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_options_unittest.cc @@ -10,7 +10,7 @@ namespace errors = extension_manifest_errors; TEST_F(ExtensionManifestTest, OptionsPageInApps) { - scoped_refptr<Extension> extension; + scoped_refptr<extensions::Extension> extension; // Allow options page with absolute URL in hosted apps. extension = LoadAndExpectSuccess("hosted_app_absolute_options.json"); diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_override_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_override_unittest.cc index 0fb2e52..b7d4c0e 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_override_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_override_unittest.cc @@ -17,7 +17,7 @@ TEST_F(ExtensionManifestTest, Override) { RunTestcases(testcases, arraysize(testcases), EXPECT_TYPE_ERROR); - scoped_refptr<Extension> extension; + scoped_refptr<extensions::Extension> extension; extension = LoadAndExpectSuccess("override_new_tab.json"); EXPECT_EQ(extension->url().spec() + "newtab.html", diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_pageaction_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_pageaction_unittest.cc index 4ecd8f9..fccc493 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_pageaction_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_pageaction_unittest.cc @@ -11,7 +11,7 @@ namespace errors = extension_manifest_errors; TEST_F(ExtensionManifestTest, PageActionManifestVersion2) { - scoped_refptr<Extension> extension( + scoped_refptr<extensions::Extension> extension( LoadAndExpectSuccess("page_action_manifest_version_2.json")); ASSERT_TRUE(extension.get()); ASSERT_TRUE(extension->page_action()); diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc index 8b39de3..ab7a852 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_platformapp_unittest.cc @@ -20,7 +20,7 @@ TEST_F(ExtensionManifestTest, PlatformApps) { CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnablePlatformApps); - scoped_refptr<Extension> extension = + scoped_refptr<extensions::Extension> extension = LoadAndExpectSuccess("init_valid_platform_app.json"); EXPECT_TRUE(extension->is_storage_isolated()); diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_storage_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_storage_unittest.cc index 8acb36c..e020bf0 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_storage_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_storage_unittest.cc @@ -25,7 +25,8 @@ TEST_F(ExtensionManifestTest, StorageAPIManifestVersionAvailability) { // Extension with no manifest version cannot use storage API. { Manifest manifest(&base_manifest, "test"); - scoped_refptr<Extension> extension = LoadAndExpectSuccess(manifest); + scoped_refptr<extensions::Extension> extension = + LoadAndExpectSuccess(manifest); if (extension.get()) { std::vector<std::string> warnings; warnings.push_back(kManifestVersionError); @@ -40,7 +41,8 @@ TEST_F(ExtensionManifestTest, StorageAPIManifestVersionAvailability) { manifest_with_version.MergeDictionary(&base_manifest); Manifest manifest(&manifest_with_version, "test"); - scoped_refptr<Extension> extension = LoadAndExpectSuccess(manifest); + scoped_refptr<extensions::Extension> extension = + LoadAndExpectSuccess(manifest); if (extension.get()) { std::vector<std::string> warnings; warnings.push_back(kManifestVersionError); @@ -55,7 +57,8 @@ TEST_F(ExtensionManifestTest, StorageAPIManifestVersionAvailability) { manifest_with_version.MergeDictionary(&base_manifest); Manifest manifest(&manifest_with_version, "test"); - scoped_refptr<Extension> extension = LoadAndExpectSuccess(manifest); + scoped_refptr<extensions::Extension> extension = + LoadAndExpectSuccess(manifest); if (extension.get()) { std::vector<std::string> empty; EXPECT_EQ(empty, extension->install_warnings()); diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_tts_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_tts_unittest.cc index fd71dd1..954a172 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_tts_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_tts_unittest.cc @@ -33,7 +33,7 @@ TEST_F(ExtensionManifestTest, TtsEngine) { RunTestcases(testcases, arraysize(testcases), EXPECT_TYPE_ERROR); - scoped_refptr<Extension> extension( + scoped_refptr<extensions::Extension> extension( LoadAndExpectSuccess("tts_engine_valid.json")); ASSERT_EQ(1u, extension->tts_voices().size()); diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_update_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_update_unittest.cc index 5f3f9d0..6d44698 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_update_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_update_unittest.cc @@ -7,6 +7,8 @@ #include "chrome/common/extensions/extension_manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" +using extensions::Extension; + namespace errors = extension_manifest_errors; TEST_F(ExtensionManifestTest, UpdateUrls) { diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_validapp_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_validapp_unittest.cc index 9eb971e..f8bd6d5 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_validapp_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_validapp_unittest.cc @@ -9,7 +9,8 @@ #include "testing/gtest/include/gtest/gtest.h" TEST_F(ExtensionManifestTest, ValidApp) { - scoped_refptr<Extension> extension(LoadAndExpectSuccess("valid_app.json")); + scoped_refptr<extensions::Extension> extension( + LoadAndExpectSuccess("valid_app.json")); URLPatternSet expected_patterns; AddPattern(&expected_patterns, "http://www.google.com/mail/*"); AddPattern(&expected_patterns, "http://www.google.com/foobar/*"); diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_web_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_web_unittest.cc index 59ca69c..879c537 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_web_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_web_unittest.cc @@ -11,6 +11,8 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webkit/glue/web_intent_service_data.h" +using extensions::Extension; + namespace errors = extension_manifest_errors; TEST_F(ExtensionManifestTest, WebAccessibleResources) { diff --git a/chrome/common/extensions/simple_feature_provider_unittest.cc b/chrome/common/extensions/simple_feature_provider_unittest.cc index 3d9dd72..fd0fd34 100644 --- a/chrome/common/extensions/simple_feature_provider_unittest.cc +++ b/chrome/common/extensions/simple_feature_provider_unittest.cc @@ -6,6 +6,7 @@ #include "testing/gtest/include/gtest/gtest.h" +using extensions::Extension; using extensions::Feature; using extensions::SimpleFeatureProvider; |