Add base:: to string16 in extensions/.
[email protected]
BUG=329295
Review URL: https://codereview.chromium.org/107803004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242211 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/extensions/common/error_utils.cc b/extensions/common/error_utils.cc
index bd4d32e0..c44e216 100644
--- a/extensions/common/error_utils.cc
+++ b/extensions/common/error_utils.cc
@@ -36,26 +36,26 @@
return ret_val;
}
-string16 ErrorUtils::FormatErrorMessageUTF16(const std::string& format,
- const std::string& s1) {
+base::string16 ErrorUtils::FormatErrorMessageUTF16(const std::string& format,
+ const std::string& s1) {
std::string ret_val = format;
ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s1);
return UTF8ToUTF16(ret_val);
}
-string16 ErrorUtils::FormatErrorMessageUTF16(const std::string& format,
- const std::string& s1,
- const std::string& s2) {
+base::string16 ErrorUtils::FormatErrorMessageUTF16(const std::string& format,
+ const std::string& s1,
+ const std::string& s2) {
std::string ret_val = format;
ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s1);
ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s2);
return UTF8ToUTF16(ret_val);
}
-string16 ErrorUtils::FormatErrorMessageUTF16(const std::string& format,
- const std::string& s1,
- const std::string& s2,
- const std::string& s3) {
+base::string16 ErrorUtils::FormatErrorMessageUTF16(const std::string& format,
+ const std::string& s1,
+ const std::string& s2,
+ const std::string& s3) {
std::string ret_val = format;
ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s1);
ReplaceFirstSubstringAfterOffset(&ret_val, 0, "*", s2);
diff --git a/extensions/common/error_utils.h b/extensions/common/error_utils.h
index c4d012a..fedbd28 100644
--- a/extensions/common/error_utils.h
+++ b/extensions/common/error_utils.h
@@ -26,17 +26,17 @@
const std::string& s2,
const std::string& s3);
- static string16 FormatErrorMessageUTF16(const std::string& format,
- const std::string& s1);
+ static base::string16 FormatErrorMessageUTF16(const std::string& format,
+ const std::string& s1);
- static string16 FormatErrorMessageUTF16(const std::string& format,
- const std::string& s1,
- const std::string& s2);
+ static base::string16 FormatErrorMessageUTF16(const std::string& format,
+ const std::string& s1,
+ const std::string& s2);
- static string16 FormatErrorMessageUTF16(const std::string& format,
- const std::string& s1,
- const std::string& s2,
- const std::string& s3);
+ static base::string16 FormatErrorMessageUTF16(const std::string& format,
+ const std::string& s1,
+ const std::string& s2,
+ const std::string& s3);
};
} // namespace extensions
diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
index 0a67983d..640e96b6 100644
--- a/extensions/common/extension.cc
+++ b/extensions/common/extension.cc
@@ -103,7 +103,7 @@
}
// TODO(sungguk): Continue removing std::string errors and replacing
-// with string16. See http://crbug.com/71980.
+// with base::string16. See http://crbug.com/71980.
scoped_refptr<Extension> Extension::Create(const base::FilePath& path,
Manifest::Location location,
const base::DictionaryValue& value,
@@ -111,7 +111,7 @@
const std::string& explicit_id,
std::string* utf8_error) {
DCHECK(utf8_error);
- string16 error;
+ base::string16 error;
scoped_ptr<extensions::Manifest> manifest(
new extensions::Manifest(
location, scoped_ptr<base::DictionaryValue>(value.DeepCopy())));
@@ -468,7 +468,7 @@
const base::FilePath& path,
const std::string& explicit_id,
int creation_flags,
- string16* error) {
+ base::string16* error) {
if (!explicit_id.empty()) {
manifest->set_extension_id(explicit_id);
return true;
@@ -521,7 +521,7 @@
Extension::~Extension() {
}
-bool Extension::InitFromValue(int flags, string16* error) {
+bool Extension::InitFromValue(int flags, base::string16* error) {
DCHECK(error);
creation_flags_ = flags;
@@ -565,15 +565,15 @@
return true;
}
-bool Extension::LoadRequiredFeatures(string16* error) {
+bool Extension::LoadRequiredFeatures(base::string16* error) {
if (!LoadName(error) ||
!LoadVersion(error))
return false;
return true;
}
-bool Extension::LoadName(string16* error) {
- string16 localized_name;
+bool Extension::LoadName(base::string16* error) {
+ base::string16 localized_name;
if (!manifest_->GetString(keys::kName, &localized_name)) {
*error = ASCIIToUTF16(errors::kInvalidName);
return false;
@@ -584,7 +584,7 @@
return true;
}
-bool Extension::LoadVersion(string16* error) {
+bool Extension::LoadVersion(base::string16* error) {
std::string version_str;
if (!manifest_->GetString(keys::kVersion, &version_str)) {
*error = ASCIIToUTF16(errors::kInvalidVersion);
@@ -598,7 +598,7 @@
return true;
}
-bool Extension::LoadAppFeatures(string16* error) {
+bool Extension::LoadAppFeatures(base::string16* error) {
if (!LoadExtent(keys::kWebURLs, &extent_,
errors::kInvalidWebURLs, errors::kInvalidWebURL, error)) {
return false;
@@ -625,7 +625,7 @@
URLPatternSet* extent,
const char* list_error,
const char* value_error,
- string16* error) {
+ base::string16* error) {
const base::Value* temp_pattern_value = NULL;
if (!manifest_->Get(key, &temp_pattern_value))
return true;
@@ -695,7 +695,7 @@
return true;
}
-bool Extension::LoadSharedFeatures(string16* error) {
+bool Extension::LoadSharedFeatures(base::string16* error) {
if (!LoadDescription(error) ||
!ManifestHandler::ParseExtension(this, error) ||
!LoadShortName(error))
@@ -704,7 +704,7 @@
return true;
}
-bool Extension::LoadDescription(string16* error) {
+bool Extension::LoadDescription(base::string16* error) {
if (manifest_->HasKey(keys::kDescription) &&
!manifest_->GetString(keys::kDescription, &description_)) {
*error = ASCIIToUTF16(errors::kInvalidDescription);
@@ -713,7 +713,7 @@
return true;
}
-bool Extension::LoadManifestVersion(string16* error) {
+bool Extension::LoadManifestVersion(base::string16* error) {
// Get the original value out of the dictionary so that we can validate it
// more strictly.
if (manifest_->value()->HasKey(keys::kManifestVersion)) {
@@ -741,9 +741,9 @@
return true;
}
-bool Extension::LoadShortName(string16* error) {
+bool Extension::LoadShortName(base::string16* error) {
if (manifest_->HasKey(keys::kShortName)) {
- string16 localized_short_name;
+ base::string16 localized_short_name;
if (!manifest_->GetString(keys::kShortName, &localized_short_name) ||
localized_short_name.empty()) {
*error = ASCIIToUTF16(errors::kInvalidShortName);
diff --git a/extensions/common/extension.h b/extensions/common/extension.h
index 4da7a03..fb2cf4c 100644
--- a/extensions/common/extension.h
+++ b/extensions/common/extension.h
@@ -341,7 +341,7 @@
const base::FilePath& path,
const std::string& explicit_id,
int creation_flags,
- string16* error);
+ base::string16* error);
Extension(const base::FilePath& path,
scoped_ptr<extensions::Manifest> manifest);
@@ -353,28 +353,28 @@
// of the underlying DictionaryValue in its members. We should decide to
// either wrap the DictionaryValue and go with that only, or we should parse
// into strong types and discard the value. But doing both is bad.
- bool InitFromValue(int flags, string16* error);
+ bool InitFromValue(int flags, base::string16* error);
// The following are helpers for InitFromValue to load various features of the
// extension from the manifest.
- bool LoadRequiredFeatures(string16* error);
- bool LoadName(string16* error);
- bool LoadVersion(string16* error);
+ bool LoadRequiredFeatures(base::string16* error);
+ bool LoadName(base::string16* error);
+ bool LoadVersion(base::string16* error);
- bool LoadAppFeatures(string16* error);
+ bool LoadAppFeatures(base::string16* error);
bool LoadExtent(const char* key,
URLPatternSet* extent,
const char* list_error,
const char* value_error,
- string16* error);
+ base::string16* error);
- bool LoadSharedFeatures(string16* error);
- bool LoadDescription(string16* error);
- bool LoadManifestVersion(string16* error);
- bool LoadShortName(string16* error);
+ bool LoadSharedFeatures(base::string16* error);
+ bool LoadDescription(base::string16* error);
+ bool LoadManifestVersion(base::string16* error);
+ bool LoadShortName(base::string16* error);
- bool CheckMinimumChromeVersion(string16* error) const;
+ bool CheckMinimumChromeVersion(base::string16* error) const;
// The extension's human-readable name. Name is used for display purpose. It
// might be wrapped with unicode bidi control characters so that it is
diff --git a/extensions/common/manifest.cc b/extensions/common/manifest.cc
index bbd8c32..32981a3 100644
--- a/extensions/common/manifest.cc
+++ b/extensions/common/manifest.cc
@@ -207,7 +207,7 @@
}
bool Manifest::GetString(
- const std::string& path, string16* out_value) const {
+ const std::string& path, base::string16* out_value) const {
return CanAccessPath(path) && value_->GetString(path, out_value);
}
diff --git a/extensions/common/manifest.h b/extensions/common/manifest.h
index f7108f88..8f4c3c7 100644
--- a/extensions/common/manifest.h
+++ b/extensions/common/manifest.h
@@ -149,7 +149,7 @@
bool GetBoolean(const std::string& path, bool* out_value) const;
bool GetInteger(const std::string& path, int* out_value) const;
bool GetString(const std::string& path, std::string* out_value) const;
- bool GetString(const std::string& path, string16* out_value) const;
+ bool GetString(const std::string& path, base::string16* out_value) const;
bool GetDictionary(const std::string& path,
const base::DictionaryValue** out_value) const;
bool GetList(const std::string& path,
diff --git a/extensions/common/manifest_handler.cc b/extensions/common/manifest_handler.cc
index 4546f328..ff0495c 100644
--- a/extensions/common/manifest_handler.cc
+++ b/extensions/common/manifest_handler.cc
@@ -79,7 +79,8 @@
}
// static
-bool ManifestHandler::ParseExtension(Extension* extension, string16* error) {
+bool ManifestHandler::ParseExtension(Extension* extension,
+ base::string16* error) {
return GetRegistry()->ParseExtension(extension, error);
}
@@ -127,7 +128,7 @@
}
bool ManifestHandlerRegistry::ParseExtension(Extension* extension,
- string16* error) {
+ base::string16* error) {
std::map<int, ManifestHandler*> handlers_by_priority;
for (ManifestHandlerMap::iterator iter = handlers_.begin();
iter != handlers_.end(); ++iter) {
diff --git a/extensions/common/manifest_handler.h b/extensions/common/manifest_handler.h
index 90fbe84..a6963f4 100644
--- a/extensions/common/manifest_handler.h
+++ b/extensions/common/manifest_handler.h
@@ -29,7 +29,7 @@
// Attempts to parse the extension's manifest.
// Returns true on success or false on failure; if false, |error| will
// be set to a failure message.
- virtual bool Parse(Extension* extension, string16* error) = 0;
+ virtual bool Parse(Extension* extension, base::string16* error) = 0;
// Validate that files associated with this manifest key exist.
// Validation takes place after parsing. May also append a series of
@@ -37,7 +37,7 @@
//
// Otherwise, returns false, and a description of the error is
// returned in |error|.
- // TODO(yoz): Change error to string16. See crbug.com/71980.
+ // TODO(yoz): Change error to base::string16. See crbug.com/71980.
virtual bool Validate(const Extension* extension,
std::string* error,
std::vector<InstallWarning>* warnings) const;
@@ -87,7 +87,7 @@
// Call Parse on all registered manifest handlers that should parse
// this extension.
- static bool ParseExtension(Extension* extension, string16* error);
+ static bool ParseExtension(Extension* extension, base::string16* error);
// Call Validate on all registered manifest handlers for this extension.
static bool ValidateExtension(const Extension* extension,
@@ -132,7 +132,7 @@
void RegisterManifestHandler(const std::string& key,
linked_ptr<ManifestHandler> handler);
- bool ParseExtension(Extension* extension, string16* error);
+ bool ParseExtension(Extension* extension, base::string16* error);
bool ValidateExtension(const Extension* extension,
std::string* error,
std::vector<InstallWarning>* warnings);
diff --git a/extensions/common/manifest_handler_unittest.cc b/extensions/common/manifest_handler_unittest.cc
index 9a3a292..8eb9fec9 100644
--- a/extensions/common/manifest_handler_unittest.cc
+++ b/extensions/common/manifest_handler_unittest.cc
@@ -83,7 +83,7 @@
: name_(name), keys_(keys), prereqs_(prereqs), watcher_(watcher) {
}
- virtual bool Parse(Extension* extension, string16* error) OVERRIDE {
+ virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE {
watcher_->Record(name_);
return true;
}
@@ -111,7 +111,7 @@
ParsingWatcher* watcher)
: TestManifestHandler(name, keys, prereqs, watcher) {
}
- virtual bool Parse(Extension* extension, string16* error) OVERRIDE {
+ virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE {
*error = ASCIIToUTF16(name_);
return false;
}
@@ -141,7 +141,7 @@
keys_(keys) {
}
- virtual bool Parse(Extension* extension, string16* error) OVERRIDE {
+ virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE {
return true;
}
diff --git a/extensions/common/manifest_handlers/background_info.cc b/extensions/common/manifest_handlers/background_info.cc
index 1ec404e..66a18e5 100644
--- a/extensions/common/manifest_handlers/background_info.cc
+++ b/extensions/common/manifest_handlers/background_info.cc
@@ -93,7 +93,7 @@
return GetBackgroundInfo(extension).has_lazy_background_page();
}
-bool BackgroundInfo::Parse(const Extension* extension, string16* error) {
+bool BackgroundInfo::Parse(const Extension* extension, base::string16* error) {
const std::string& bg_scripts_key = extension->is_platform_app() ?
keys::kPlatformAppBackgroundScripts : keys::kBackgroundScripts;
if (!LoadBackgroundScripts(extension, bg_scripts_key, error) ||
@@ -107,7 +107,7 @@
bool BackgroundInfo::LoadBackgroundScripts(const Extension* extension,
const std::string& key,
- string16* error) {
+ base::string16* error) {
const base::Value* background_scripts_value = NULL;
if (!extension->manifest()->Get(key, &background_scripts_value))
return true;
@@ -135,7 +135,7 @@
bool BackgroundInfo::LoadBackgroundPage(const Extension* extension,
const std::string& key,
- string16* error) {
+ base::string16* error) {
const base::Value* background_page_value = NULL;
if (!extension->manifest()->Get(key, &background_page_value))
return true;
@@ -180,7 +180,7 @@
}
bool BackgroundInfo::LoadBackgroundPage(const Extension* extension,
- string16* error) {
+ base::string16* error) {
if (extension->is_platform_app()) {
return LoadBackgroundPage(
extension, keys::kPlatformAppBackgroundPage, error);
@@ -194,7 +194,7 @@
}
bool BackgroundInfo::LoadBackgroundPersistent(const Extension* extension,
- string16* error) {
+ base::string16* error) {
if (extension->is_platform_app()) {
is_persistent_ = false;
return true;
@@ -219,7 +219,7 @@
}
bool BackgroundInfo::LoadAllowJSAccess(const Extension* extension,
- string16* error) {
+ base::string16* error) {
const base::Value* allow_js_access = NULL;
if (!extension->manifest()->Get(keys::kBackgroundAllowJsAccess,
&allow_js_access))
@@ -240,7 +240,8 @@
BackgroundManifestHandler::~BackgroundManifestHandler() {
}
-bool BackgroundManifestHandler::Parse(Extension* extension, string16* error) {
+bool BackgroundManifestHandler::Parse(Extension* extension,
+ base::string16* error) {
scoped_ptr<BackgroundInfo> info(new BackgroundInfo);
if (!info->Parse(extension, error))
return false;
diff --git a/extensions/common/manifest_handlers/background_info.h b/extensions/common/manifest_handlers/background_info.h
index 113c341..e9e360e 100644
--- a/extensions/common/manifest_handlers/background_info.h
+++ b/extensions/common/manifest_handlers/background_info.h
@@ -41,18 +41,19 @@
return has_background_page() && !is_persistent_;
}
- bool Parse(const Extension* extension, string16* error);
+ bool Parse(const Extension* extension, base::string16* error);
private:
bool LoadBackgroundScripts(const Extension* extension,
const std::string& key,
- string16* error);
+ base::string16* error);
bool LoadBackgroundPage(const Extension* extension,
const std::string& key,
- string16* error);
- bool LoadBackgroundPage(const Extension* extension, string16* error);
- bool LoadBackgroundPersistent(const Extension* extension, string16* error);
- bool LoadAllowJSAccess(const Extension* extension, string16* error);
+ base::string16* error);
+ bool LoadBackgroundPage(const Extension* extension, base::string16* error);
+ bool LoadBackgroundPersistent(const Extension* extension,
+ base::string16* error);
+ bool LoadAllowJSAccess(const Extension* extension, base::string16* error);
// Optional URL to a master page of which a single instance should be always
// loaded in the background.
@@ -82,7 +83,7 @@
BackgroundManifestHandler();
virtual ~BackgroundManifestHandler();
- virtual bool Parse(Extension* extension, string16* error) OVERRIDE;
+ virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE;
virtual bool Validate(const Extension* extension,
std::string* error,
std::vector<InstallWarning>* warnings) const OVERRIDE;
diff --git a/extensions/common/manifest_handlers/csp_info.cc b/extensions/common/manifest_handlers/csp_info.cc
index 79f531a4f..842a640 100644
--- a/extensions/common/manifest_handlers/csp_info.cc
+++ b/extensions/common/manifest_handlers/csp_info.cc
@@ -77,7 +77,7 @@
CSPHandler::~CSPHandler() {
}
-bool CSPHandler::Parse(Extension* extension, string16* error) {
+bool CSPHandler::Parse(Extension* extension, base::string16* error) {
const std::string key = Keys()[0];
if (!extension->manifest()->HasPath(key)) {
if (extension->manifest_version() >= 2) {
diff --git a/extensions/common/manifest_handlers/csp_info.h b/extensions/common/manifest_handlers/csp_info.h
index c0ac884..7b5b25d 100644
--- a/extensions/common/manifest_handlers/csp_info.h
+++ b/extensions/common/manifest_handlers/csp_info.h
@@ -38,7 +38,7 @@
explicit CSPHandler(bool is_platform_app);
virtual ~CSPHandler();
- virtual bool Parse(Extension* extension, string16* error) OVERRIDE;
+ virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE;
virtual bool AlwaysParseForType(Manifest::Type type) const OVERRIDE;
private:
diff --git a/extensions/common/manifest_handlers/incognito_info.cc b/extensions/common/manifest_handlers/incognito_info.cc
index b57a8a63..a56ac6b 100644
--- a/extensions/common/manifest_handlers/incognito_info.cc
+++ b/extensions/common/manifest_handlers/incognito_info.cc
@@ -34,7 +34,7 @@
IncognitoHandler::~IncognitoHandler() {
}
-bool IncognitoHandler::Parse(Extension* extension, string16* error) {
+bool IncognitoHandler::Parse(Extension* extension, base::string16* error) {
if (!extension->manifest()->HasKey(keys::kIncognito)) {
// Extensions and Chrome apps default to spanning mode.
// Hosted and legacy packaged apps default to split mode.
diff --git a/extensions/common/manifest_handlers/incognito_info.h b/extensions/common/manifest_handlers/incognito_info.h
index cd44934a..3650883 100644
--- a/extensions/common/manifest_handlers/incognito_info.h
+++ b/extensions/common/manifest_handlers/incognito_info.h
@@ -29,7 +29,7 @@
IncognitoHandler();
virtual ~IncognitoHandler();
- virtual bool Parse(Extension* extension, string16* error) OVERRIDE;
+ virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE;
virtual bool AlwaysParseForType(Manifest::Type type) const OVERRIDE;
private:
diff --git a/extensions/common/manifest_handlers/kiosk_mode_info.cc b/extensions/common/manifest_handlers/kiosk_mode_info.cc
index 92f406b0..41b0c8c 100644
--- a/extensions/common/manifest_handlers/kiosk_mode_info.cc
+++ b/extensions/common/manifest_handlers/kiosk_mode_info.cc
@@ -44,7 +44,7 @@
KioskModeHandler::~KioskModeHandler() {
}
-bool KioskModeHandler::Parse(Extension* extension, string16* error) {
+bool KioskModeHandler::Parse(Extension* extension, base::string16* error) {
const Manifest* manifest = extension->manifest();
DCHECK(manifest->HasKey(keys::kKioskEnabled) ||
manifest->HasKey(keys::kKioskOnly));
diff --git a/extensions/common/manifest_handlers/kiosk_mode_info.h b/extensions/common/manifest_handlers/kiosk_mode_info.h
index e98fa315..9cf57e9 100644
--- a/extensions/common/manifest_handlers/kiosk_mode_info.h
+++ b/extensions/common/manifest_handlers/kiosk_mode_info.h
@@ -40,7 +40,7 @@
KioskModeHandler();
virtual ~KioskModeHandler();
- virtual bool Parse(Extension* extension, string16* error) OVERRIDE;
+ virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE;
private:
virtual const std::vector<std::string> Keys() const OVERRIDE;
diff --git a/extensions/common/manifest_handlers/offline_enabled_info.cc b/extensions/common/manifest_handlers/offline_enabled_info.cc
index 7cf1835..7d6bdc93 100644
--- a/extensions/common/manifest_handlers/offline_enabled_info.cc
+++ b/extensions/common/manifest_handlers/offline_enabled_info.cc
@@ -35,7 +35,7 @@
OfflineEnabledHandler::~OfflineEnabledHandler() {
}
-bool OfflineEnabledHandler::Parse(Extension* extension, string16* error) {
+bool OfflineEnabledHandler::Parse(Extension* extension, base::string16* error) {
if (!extension->manifest()->HasKey(keys::kOfflineEnabled)) {
// Only platform apps default to being enabled offline, and we should only
// attempt parsing without a key present if it is a platform app.
diff --git a/extensions/common/manifest_handlers/offline_enabled_info.h b/extensions/common/manifest_handlers/offline_enabled_info.h
index e9b4f35d..55aa837 100644
--- a/extensions/common/manifest_handlers/offline_enabled_info.h
+++ b/extensions/common/manifest_handlers/offline_enabled_info.h
@@ -31,7 +31,7 @@
OfflineEnabledHandler();
virtual ~OfflineEnabledHandler();
- virtual bool Parse(Extension* extension, string16* error) OVERRIDE;
+ virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE;
virtual bool AlwaysParseForType(Manifest::Type type) const OVERRIDE;
private:
diff --git a/extensions/common/manifest_handlers/requirements_info.cc b/extensions/common/manifest_handlers/requirements_info.cc
index aaf30dd..7838e824 100644
--- a/extensions/common/manifest_handlers/requirements_info.cc
+++ b/extensions/common/manifest_handlers/requirements_info.cc
@@ -60,7 +60,7 @@
return true;
}
-bool RequirementsHandler::Parse(Extension* extension, string16* error) {
+bool RequirementsHandler::Parse(Extension* extension, base::string16* error) {
scoped_ptr<RequirementsInfo> requirements(
new RequirementsInfo(extension->manifest()));
diff --git a/extensions/common/manifest_handlers/requirements_info.h b/extensions/common/manifest_handlers/requirements_info.h
index adc128bdb..37dbfb98 100644
--- a/extensions/common/manifest_handlers/requirements_info.h
+++ b/extensions/common/manifest_handlers/requirements_info.h
@@ -32,7 +32,7 @@
RequirementsHandler();
virtual ~RequirementsHandler();
- virtual bool Parse(Extension* extension, string16* error) OVERRIDE;
+ virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE;
virtual bool AlwaysParseForType(Manifest::Type type) const OVERRIDE;
diff --git a/extensions/common/manifest_handlers/sandboxed_page_info.cc b/extensions/common/manifest_handlers/sandboxed_page_info.cc
index a225a70..d430a8ad 100644
--- a/extensions/common/manifest_handlers/sandboxed_page_info.cc
+++ b/extensions/common/manifest_handlers/sandboxed_page_info.cc
@@ -61,7 +61,7 @@
SandboxedPageHandler::~SandboxedPageHandler() {
}
-bool SandboxedPageHandler::Parse(Extension* extension, string16* error) {
+bool SandboxedPageHandler::Parse(Extension* extension, base::string16* error) {
scoped_ptr<SandboxedPageInfo> sandboxed_info(new SandboxedPageInfo);
const base::ListValue* list_value = NULL;
diff --git a/extensions/common/manifest_handlers/sandboxed_page_info.h b/extensions/common/manifest_handlers/sandboxed_page_info.h
index 936973e9..9dbc9a6 100644
--- a/extensions/common/manifest_handlers/sandboxed_page_info.h
+++ b/extensions/common/manifest_handlers/sandboxed_page_info.h
@@ -44,7 +44,7 @@
SandboxedPageHandler();
virtual ~SandboxedPageHandler();
- virtual bool Parse(Extension* extension, string16* error) OVERRIDE;
+ virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE;
private:
virtual const std::vector<std::string> Keys() const OVERRIDE;
diff --git a/extensions/common/manifest_handlers/shared_module_info.cc b/extensions/common/manifest_handlers/shared_module_info.cc
index 09df879..df9044c 100644
--- a/extensions/common/manifest_handlers/shared_module_info.cc
+++ b/extensions/common/manifest_handlers/shared_module_info.cc
@@ -105,7 +105,8 @@
return GetSharedModuleInfo(extension).imports_;
}
-bool SharedModuleInfo::Parse(const Extension* extension, string16* error) {
+bool SharedModuleInfo::Parse(const Extension* extension,
+ base::string16* error) {
bool has_import = extension->manifest()->HasKey(keys::kImport);
bool has_export = extension->manifest()->HasKey(keys::kExport);
if (!has_import && !has_export)
@@ -193,7 +194,7 @@
SharedModuleHandler::~SharedModuleHandler() {
}
-bool SharedModuleHandler::Parse(Extension* extension, string16* error) {
+bool SharedModuleHandler::Parse(Extension* extension, base::string16* error) {
scoped_ptr<SharedModuleInfo> info(new SharedModuleInfo);
if (!info->Parse(extension, error))
return false;
diff --git a/extensions/common/manifest_handlers/shared_module_info.h b/extensions/common/manifest_handlers/shared_module_info.h
index db51594..4240ed7 100644
--- a/extensions/common/manifest_handlers/shared_module_info.h
+++ b/extensions/common/manifest_handlers/shared_module_info.h
@@ -19,7 +19,7 @@
SharedModuleInfo();
virtual ~SharedModuleInfo();
- bool Parse(const Extension* extension, string16* error);
+ bool Parse(const Extension* extension, base::string16* error);
struct ImportInfo {
std::string extension_id;
@@ -57,7 +57,7 @@
SharedModuleHandler();
virtual ~SharedModuleHandler();
- virtual bool Parse(Extension* extension, string16* error) OVERRIDE;
+ virtual bool Parse(Extension* extension, base::string16* error) OVERRIDE;
virtual bool Validate(const Extension* extension,
std::string* error,
std::vector<InstallWarning>* warnings) const OVERRIDE;
diff --git a/extensions/common/permissions/api_permission_set.cc b/extensions/common/permissions/api_permission_set.cc
index 0ed7769..88d78ee 100644
--- a/extensions/common/permissions/api_permission_set.cc
+++ b/extensions/common/permissions/api_permission_set.cc
@@ -23,7 +23,7 @@
const base::Value* permission_value,
APIPermissionSet::ParseSource source,
APIPermissionSet* api_permissions,
- string16* error,
+ base::string16* error,
std::vector<std::string>* unhandled_permissions) {
const APIPermissionInfo* permission_info =
@@ -66,7 +66,7 @@
const base::Value* permission_value,
APIPermissionSet::ParseSource source,
APIPermissionSet* api_permissions,
- string16* error,
+ base::string16* error,
std::vector<std::string>* unhandled_permissions) {
if (permission_value) {
const base::ListValue* permissions;
@@ -124,7 +124,7 @@
const base::ListValue* permissions,
APIPermissionSet::ParseSource source,
APIPermissionSet* api_permissions,
- string16* error,
+ base::string16* error,
std::vector<std::string>* unhandled_permissions) {
for (size_t i = 0; i < permissions->GetSize(); ++i) {
std::string permission_str;
diff --git a/extensions/common/permissions/api_permission_set.h b/extensions/common/permissions/api_permission_set.h
index c5dd248..4db19f6 100644
--- a/extensions/common/permissions/api_permission_set.h
+++ b/extensions/common/permissions/api_permission_set.h
@@ -54,7 +54,7 @@
const base::ListValue* permissions,
ParseSource source,
APIPermissionSet* api_permissions,
- string16* error,
+ base::string16* error,
std::vector<std::string>* unhandled_permissions);
void AddImpliedPermissions();
diff --git a/extensions/common/permissions/manifest_permission_set.cc b/extensions/common/permissions/manifest_permission_set.cc
index 821159f6..fecb611 100644
--- a/extensions/common/permissions/manifest_permission_set.cc
+++ b/extensions/common/permissions/manifest_permission_set.cc
@@ -24,7 +24,7 @@
const std::string& permission_name,
const base::Value* permission_value,
ManifestPermissionSet* manifest_permissions,
- string16* error,
+ base::string16* error,
std::vector<std::string>* unhandled_permissions) {
scoped_ptr<ManifestPermission> permission(
@@ -60,7 +60,7 @@
bool ManifestPermissionSet::ParseFromJSON(
const base::ListValue* permissions,
ManifestPermissionSet* manifest_permissions,
- string16* error,
+ base::string16* error,
std::vector<std::string>* unhandled_permissions) {
for (size_t i = 0; i < permissions->GetSize(); ++i) {
std::string permission_name;
diff --git a/extensions/common/permissions/manifest_permission_set.h b/extensions/common/permissions/manifest_permission_set.h
index e9683bc..4b1ffe0 100644
--- a/extensions/common/permissions/manifest_permission_set.h
+++ b/extensions/common/permissions/manifest_permission_set.h
@@ -38,7 +38,7 @@
static bool ParseFromJSON(
const base::ListValue* permissions,
ManifestPermissionSet* manifest_permissions,
- string16* error,
+ base::string16* error,
std::vector<std::string>* unhandled_permissions);
};
diff --git a/extensions/common/permissions/permission_message.cc b/extensions/common/permissions/permission_message.cc
index 1b11a37a..bc2008e0 100644
--- a/extensions/common/permissions/permission_message.cc
+++ b/extensions/common/permissions/permission_message.cc
@@ -10,13 +10,15 @@
//
PermissionMessage::PermissionMessage(
- PermissionMessage::ID id, const string16& message)
+ PermissionMessage::ID id, const base::string16& message)
: id_(id),
message_(message) {
}
PermissionMessage::PermissionMessage(
- PermissionMessage::ID id, const string16& message, const string16& details)
+ PermissionMessage::ID id,
+ const base::string16& message,
+ const base::string16& details)
: id_(id),
message_(message),
details_(details) {
diff --git a/extensions/common/permissions/permission_message.h b/extensions/common/permissions/permission_message.h
index b4d53b7a..275aa1c6 100644
--- a/extensions/common/permissions/permission_message.h
+++ b/extensions/common/permissions/permission_message.h
@@ -86,8 +86,10 @@
kNone_not_greater_than_kUnknown);
// Creates the corresponding permission message.
- PermissionMessage(ID id, const string16& message);
- PermissionMessage(ID id, const string16& message, const string16& details);
+ PermissionMessage(ID id, const base::string16& message);
+ PermissionMessage(ID id,
+ const base::string16& message,
+ const base::string16& details);
~PermissionMessage();
// Gets the id of the permission message, which can be used in UMA
@@ -96,12 +98,12 @@
// Gets a localized message describing this permission. Please note that
// the message will be empty for message types TYPE_NONE and TYPE_UNKNOWN.
- const string16& message() const { return message_; }
+ const base::string16& message() const { return message_; }
// Gets a localized message describing the details for this permission. Please
// note that the message will be empty for message types TYPE_NONE and
// TYPE_UNKNOWN.
- const string16& details() const { return details_; }
+ const base::string16& details() const { return details_; }
// Comparator to work with std::set.
bool operator<(const PermissionMessage& that) const {
@@ -114,8 +116,8 @@
private:
ID id_;
- string16 message_;
- string16 details_;
+ base::string16 message_;
+ base::string16 details_;
};
typedef std::vector<PermissionMessage> PermissionMessages;
diff --git a/extensions/common/permissions/permission_message_provider.h b/extensions/common/permissions/permission_message_provider.h
index 7f682e3..ab8b49e6 100644
--- a/extensions/common/permissions/permission_message_provider.h
+++ b/extensions/common/permissions/permission_message_provider.h
@@ -33,14 +33,14 @@
// Gets the localized permission messages that represent this set (represented
// as strings). The set of permission messages shown varies by extension type.
- virtual std::vector<string16> GetWarningMessages(
+ virtual std::vector<base::string16> GetWarningMessages(
const PermissionSet* permissions,
Manifest::Type extension_type) const = 0;
// Gets the localized permission details for messages that represent this set
// (represented as strings). The set of permission messages shown varies by
// extension type.
- virtual std::vector<string16> GetWarningMessagesDetails(
+ virtual std::vector<base::string16> GetWarningMessagesDetails(
const PermissionSet* permissions,
Manifest::Type extension_type) const = 0;
diff --git a/extensions/common/permissions/permissions_data.cc b/extensions/common/permissions/permissions_data.cc
index f43d1d77..3e6e85f 100644
--- a/extensions/common/permissions/permissions_data.cc
+++ b/extensions/common/permissions/permissions_data.cc
@@ -95,7 +95,7 @@
const char* key,
APIPermissionSet* api_permissions,
URLPatternSet* host_permissions,
- string16* error) {
+ base::string16* error) {
if (!extension->manifest()->HasKey(key))
return true;
@@ -429,11 +429,11 @@
}
// static
-std::vector<string16> PermissionsData::GetPermissionMessageStrings(
+std::vector<base::string16> PermissionsData::GetPermissionMessageStrings(
const Extension* extension) {
base::AutoLock auto_lock(extension->permissions_data()->runtime_lock_);
if (ShouldSkipPermissionWarnings(extension)) {
- return std::vector<string16>();
+ return std::vector<base::string16>();
} else {
return PermissionMessageProvider::Get()->GetWarningMessages(
GetActivePermissions(extension), extension->GetType());
@@ -441,11 +441,11 @@
}
// static
-std::vector<string16> PermissionsData::GetPermissionMessageDetailsStrings(
+std::vector<base::string16> PermissionsData::GetPermissionMessageDetailsStrings(
const Extension* extension) {
base::AutoLock auto_lock(extension->permissions_data()->runtime_lock_);
if (ShouldSkipPermissionWarnings(extension)) {
- return std::vector<string16>();
+ return std::vector<base::string16>();
} else {
return PermissionMessageProvider::Get()->GetWarningMessagesDetails(
GetActivePermissions(extension), extension->GetType());
@@ -561,7 +561,8 @@
return false;
}
-bool PermissionsData::ParsePermissions(Extension* extension, string16* error) {
+bool PermissionsData::ParsePermissions(Extension* extension,
+ base::string16* error) {
initial_required_permissions_.reset(new InitialPermissions);
if (!ParseHelper(extension,
keys::kPermissions,
diff --git a/extensions/common/permissions/permissions_data.h b/extensions/common/permissions/permissions_data.h
index 72b9d24..9eff2b74 100644
--- a/extensions/common/permissions/permissions_data.h
+++ b/extensions/common/permissions/permissions_data.h
@@ -141,13 +141,13 @@
// Returns the full list of permission messages that the given |extension|
// should display at install time. The messages are returned as strings
// for convenience.
- static std::vector<string16> GetPermissionMessageStrings(
+ static std::vector<base::string16> GetPermissionMessageStrings(
const Extension* extension);
// Returns the full list of permission details for messages that the given
// |extension| should display at install time. The messages are returned as
// strings for convenience.
- static std::vector<string16> GetPermissionMessageDetailsStrings(
+ static std::vector<base::string16> GetPermissionMessageDetailsStrings(
const Extension* extension);
// Returns true if the given |extension| can execute script on a page. If a
@@ -179,7 +179,7 @@
std::string* error);
// Parse the permissions of a given extension in the initialization process.
- bool ParsePermissions(Extension* extension, string16* error);
+ bool ParsePermissions(Extension* extension, base::string16* error);
// Ensure manifest handlers provide their custom manifest permissions.
void InitializeManifestPermissions(Extension* extension);
diff --git a/extensions/common/permissions/permissions_data_unittest.cc b/extensions/common/permissions/permissions_data_unittest.cc
index 3ea4856a..c2914e5 100644
--- a/extensions/common/permissions/permissions_data_unittest.cc
+++ b/extensions/common/permissions/permissions_data_unittest.cc
@@ -153,7 +153,7 @@
TEST(ExtensionPermissionsTest, GetPermissionMessages_ManyAPIPermissions) {
scoped_refptr<Extension> extension;
extension = LoadManifest("permissions", "many-apis.json");
- std::vector<string16> warnings =
+ std::vector<base::string16> warnings =
PermissionsData::GetPermissionMessageStrings(extension.get());
ASSERT_EQ(6u, warnings.size());
EXPECT_EQ("Access your data on api.flickr.com",
@@ -169,9 +169,9 @@
TEST(ExtensionPermissionsTest, GetPermissionMessages_ManyHostsPermissions) {
scoped_refptr<Extension> extension;
extension = LoadManifest("permissions", "more-than-3-hosts.json");
- std::vector<string16> warnings =
+ std::vector<base::string16> warnings =
PermissionsData::GetPermissionMessageStrings(extension.get());
- std::vector<string16> warnings_details =
+ std::vector<base::string16> warnings_details =
PermissionsData::GetPermissionMessageDetailsStrings(extension.get());
ASSERT_EQ(1u, warnings.size());
ASSERT_EQ(1u, warnings_details.size());
@@ -186,7 +186,7 @@
"location-api.json",
Manifest::COMPONENT,
Extension::NO_FLAGS);
- std::vector<string16> warnings =
+ std::vector<base::string16> warnings =
PermissionsData::GetPermissionMessageStrings(extension.get());
ASSERT_EQ(1u, warnings.size());
EXPECT_EQ("Detect your physical location", UTF16ToUTF8(warnings[0]));
@@ -195,7 +195,7 @@
TEST(ExtensionPermissionsTest, GetPermissionMessages_ManyHosts) {
scoped_refptr<Extension> extension;
extension = LoadManifest("permissions", "many-hosts.json");
- std::vector<string16> warnings =
+ std::vector<base::string16> warnings =
PermissionsData::GetPermissionMessageStrings(extension.get());
ASSERT_EQ(1u, warnings.size());
EXPECT_EQ("Access your data on encrypted.google.com and www.google.com",
@@ -205,7 +205,7 @@
TEST(ExtensionPermissionsTest, GetPermissionMessages_Plugins) {
scoped_refptr<Extension> extension;
extension = LoadManifest("permissions", "plugins.json");
- std::vector<string16> warnings =
+ std::vector<base::string16> warnings =
PermissionsData::GetPermissionMessageStrings(extension.get());
// We don't parse the plugins key on Chrome OS, so it should not ask for any
// permissions.
diff --git a/extensions/common/value_builder.cc b/extensions/common/value_builder.cc
index c32679e..0b257454 100644
--- a/extensions/common/value_builder.cc
+++ b/extensions/common/value_builder.cc
@@ -34,7 +34,7 @@
}
DictionaryBuilder& DictionaryBuilder::Set(const std::string& path,
- const string16& in_value) {
+ const base::string16& in_value) {
dict_->SetWithoutPathExpansion(path, new base::StringValue(in_value));
return *this;
}
@@ -79,7 +79,7 @@
return *this;
}
-ListBuilder& ListBuilder::Append(const string16& in_value) {
+ListBuilder& ListBuilder::Append(const base::string16& in_value) {
list_->Append(new base::StringValue(in_value));
return *this;
}
diff --git a/extensions/common/value_builder.h b/extensions/common/value_builder.h
index 77b0d73..bcb40aa 100644
--- a/extensions/common/value_builder.h
+++ b/extensions/common/value_builder.h
@@ -59,7 +59,8 @@
DictionaryBuilder& Set(const std::string& path, int in_value);
DictionaryBuilder& Set(const std::string& path, double in_value);
DictionaryBuilder& Set(const std::string& path, const std::string& in_value);
- DictionaryBuilder& Set(const std::string& path, const string16& in_value);
+ DictionaryBuilder& Set(const std::string& path,
+ const base::string16& in_value);
DictionaryBuilder& Set(const std::string& path, DictionaryBuilder& in_value);
DictionaryBuilder& Set(const std::string& path, ListBuilder& in_value);
@@ -87,7 +88,7 @@
ListBuilder& Append(int in_value);
ListBuilder& Append(double in_value);
ListBuilder& Append(const std::string& in_value);
- ListBuilder& Append(const string16& in_value);
+ ListBuilder& Append(const base::string16& in_value);
ListBuilder& Append(DictionaryBuilder& in_value);
ListBuilder& Append(ListBuilder& in_value);
