| Index: net/http/http_content_disposition.cc
|
| diff --git a/net/http/http_content_disposition.cc b/net/http/http_content_disposition.cc
|
| index 83098f4c4d8d302996c03caf9478b2a976e06d97..3a1dedeb788077aa7ec46f87c57dd0f1ca6c60d8 100644
|
| --- a/net/http/http_content_disposition.cc
|
| +++ b/net/http/http_content_disposition.cc
|
| @@ -86,9 +86,9 @@ bool DecodeWord(const std::string& encoded_word,
|
| if (encoded_word.empty())
|
| return true;
|
|
|
| - if (!IsStringASCII(encoded_word)) {
|
| + if (!base::IsStringASCII(encoded_word)) {
|
| // Try UTF-8, referrer_charset and the native OS default charset in turn.
|
| - if (IsStringUTF8(encoded_word)) {
|
| + if (base::IsStringUTF8(encoded_word)) {
|
| *output = encoded_word;
|
| } else {
|
| base::string16 utf16_output;
|
| @@ -191,7 +191,7 @@ bool DecodeWord(const std::string& encoded_word,
|
| if (decoded_word != encoded_word)
|
| *parse_result_flags |=
|
| net::HttpContentDisposition::HAS_PERCENT_ENCODED_STRINGS;
|
| - if (IsStringUTF8(decoded_word)) {
|
| + if (base::IsStringUTF8(decoded_word)) {
|
| output->swap(decoded_word);
|
| return true;
|
| // We can try either the OS default charset or 'origin charset' here,
|
| @@ -317,7 +317,7 @@ bool DecodeExtValue(const std::string& param_value, std::string* decoded) {
|
| return false;
|
|
|
| // RFC 5987 value should be ASCII-only.
|
| - if (!IsStringASCII(value)) {
|
| + if (!base::IsStringASCII(value)) {
|
| decoded->clear();
|
| return true;
|
| }
|
|
|