diff options
Diffstat (limited to 'chrome/browser/extensions')
7 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/extensions/api/cookies/cookies_helpers.cc b/chrome/browser/extensions/api/cookies/cookies_helpers.cc index 750bd1e..910ebb6 100644 --- a/chrome/browser/extensions/api/cookies/cookies_helpers.cc +++ b/chrome/browser/extensions/api/cookies/cookies_helpers.cc @@ -76,8 +76,8 @@ scoped_ptr<Cookie> CreateCookie( cookie->host_only = net::cookie_util::DomainIsHostOnly( canonical_cookie.Domain()); // A non-UTF8 path is invalid, so we just replace it with an empty string. - cookie->path = IsStringUTF8(canonical_cookie.Path()) ? canonical_cookie.Path() - : std::string(); + cookie->path = base::IsStringUTF8(canonical_cookie.Path()) ? + canonical_cookie.Path() : std::string(); cookie->secure = canonical_cookie.IsSecure(); cookie->http_only = canonical_cookie.IsHttpOnly(); cookie->session = !canonical_cookie.IsPersistent(); diff --git a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc index e7c1174..64a4282 100644 --- a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc +++ b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc @@ -112,7 +112,7 @@ bool GetPacUrlFromExtensionPref(const base::DictionaryValue* proxy_config, *bad_message = true; return false; } - if (!IsStringASCII(pac_url16)) { + if (!base::IsStringASCII(pac_url16)) { *error = "'pacScript.url' supports only ASCII URLs " "(encode URLs in Punycode format)."; return false; @@ -137,7 +137,7 @@ bool GetPacDataFromExtensionPref(const base::DictionaryValue* proxy_config, *bad_message = true; return false; } - if (!IsStringASCII(pac_data16)) { + if (!base::IsStringASCII(pac_data16)) { *error = "'pacScript.data' supports only ASCII code" "(encode URLs in Punycode format)."; return false; @@ -169,7 +169,7 @@ bool GetProxyServer(const base::DictionaryValue* proxy_server, *bad_message = true; return false; } - if (!IsStringASCII(host16)) { + if (!base::IsStringASCII(host16)) { *error = ErrorUtils::FormatErrorMessage( "Invalid 'rules.???.host' entry '*'. 'host' field supports only ASCII " "URLs (encode URLs in Punycode format).", @@ -272,7 +272,7 @@ bool JoinUrlList(const base::ListValue* list, *bad_message = true; return false; } - if (!IsStringASCII(entry)) { + if (!base::IsStringASCII(entry)) { *error = "'rules.bypassList' supports only ASCII URLs " "(encode URLs in Punycode format)."; return false; diff --git a/chrome/browser/extensions/api/serial/serial_connection.cc b/chrome/browser/extensions/api/serial/serial_connection.cc index 8ff045e..3671901 100644 --- a/chrome/browser/extensions/api/serial/serial_connection.cc +++ b/chrome/browser/extensions/api/serial/serial_connection.cc @@ -164,7 +164,7 @@ void SerialConnection::StartOpen() { // It's the responsibility of the API wrapper around SerialConnection to // validate the supplied path against the set of valid port names, and // it is a reasonable assumption that serial port names are ASCII. - DCHECK(IsStringASCII(port_)); + DCHECK(base::IsStringASCII(port_)); base::FilePath path( base::FilePath::FromUTF8Unsafe(MaybeFixUpPortName(port_))); int flags = base::File::FLAG_OPEN | base::File::FLAG_READ | diff --git a/chrome/browser/extensions/api/web_request/web_request_api.cc b/chrome/browser/extensions/api/web_request/web_request_api.cc index f7aae30..eef2a807 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api.cc @@ -302,7 +302,7 @@ base::DictionaryValue* ToHeaderDictionary(const std::string& name, const std::string& value) { base::DictionaryValue* header = new base::DictionaryValue(); header->SetString(keys::kHeaderNameKey, name); - if (IsStringUTF8(value)) { + if (base::IsStringUTF8(value)) { header->SetString(keys::kHeaderValueKey, value); } else { header->Set(keys::kHeaderBinaryValueKey, diff --git a/chrome/browser/extensions/convert_user_script.cc b/chrome/browser/extensions/convert_user_script.cc index b67892c..1a7d48f 100644 --- a/chrome/browser/extensions/convert_user_script.cc +++ b/chrome/browser/extensions/convert_user_script.cc @@ -39,7 +39,7 @@ scoped_refptr<Extension> ConvertUserScriptToExtension( return NULL; } - if (!IsStringUTF8(content)) { + if (!base::IsStringUTF8(content)) { *error = base::ASCIIToUTF16("User script must be UTF8 encoded."); return NULL; } diff --git a/chrome/browser/extensions/extension_garbage_collector.cc b/chrome/browser/extensions/extension_garbage_collector.cc index df33b09..5419873 100644 --- a/chrome/browser/extensions/extension_garbage_collector.cc +++ b/chrome/browser/extensions/extension_garbage_collector.cc @@ -54,7 +54,7 @@ void CheckExtensionDirectory(const base::FilePath& path, // Parse directory name as a potential extension ID. std::string extension_id; - if (IsStringASCII(basename.value())) { + if (base::IsStringASCII(basename.value())) { extension_id = base::UTF16ToASCII(basename.LossyDisplayName()); if (!Extension::IdIsValid(extension_id)) extension_id.clear(); diff --git a/chrome/browser/extensions/url_request_util.cc b/chrome/browser/extensions/url_request_util.cc index 82dd7f7..8df596c 100644 --- a/chrome/browser/extensions/url_request_util.cc +++ b/chrome/browser/extensions/url_request_util.cc @@ -107,7 +107,7 @@ class URLRequestResourceBundleJob : public net::URLRequestSimpleJob { if (StartsWithASCII(*read_mime_type, "text/", false)) { // All of our HTML files should be UTF-8 and for other resource types // (like images), charset doesn't matter. - DCHECK(IsStringUTF8(*data)); + DCHECK(base::IsStringUTF8(*data)); *charset = "utf-8"; } int result = read_result ? net::OK : net::ERR_INVALID_URL; |