Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(651)

Unified Diff: trunk/src/net/http/http_content_disposition.cc

Issue 198163004: Revert 257524 "Move IsStringASCII/UTF8 to base namespace." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/net/ftp/ftp_network_transaction.cc ('k') | trunk/src/net/proxy/proxy_resolver_v8.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/net/http/http_content_disposition.cc
===================================================================
--- trunk/src/net/http/http_content_disposition.cc (revision 257532)
+++ trunk/src/net/http/http_content_disposition.cc (working copy)
@@ -103,9 +103,9 @@
if (encoded_word.empty())
return true;
- if (!base::IsStringASCII(encoded_word)) {
+ if (!IsStringASCII(encoded_word)) {
// Try UTF-8, referrer_charset and the native OS default charset in turn.
- if (base::IsStringUTF8(encoded_word)) {
+ if (IsStringUTF8(encoded_word)) {
*output = encoded_word;
} else {
base::string16 utf16_output;
@@ -209,7 +209,7 @@
if (decoded_word != encoded_word)
*parse_result_flags |=
net::HttpContentDisposition::HAS_PERCENT_ENCODED_STRINGS;
- if (base::IsStringUTF8(decoded_word)) {
+ if (IsStringUTF8(decoded_word)) {
output->swap(decoded_word);
return true;
// We can try either the OS default charset or 'origin charset' here,
@@ -335,7 +335,7 @@
return false;
// RFC 5987 value should be ASCII-only.
- if (!base::IsStringASCII(value)) {
+ if (!IsStringASCII(value)) {
decoded->clear();
return true;
}
« no previous file with comments | « trunk/src/net/ftp/ftp_network_transaction.cc ('k') | trunk/src/net/proxy/proxy_resolver_v8.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698