diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-17 23:55:43 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-17 23:55:43 +0000 |
| commit | bd6fc2fb1af851ac7e2f4a3e08ad3a92ab6ba4af (patch) | |
| tree | db093d44a2b6964ae5b54b140bdef71a8b7a337d /net/base | |
| parent | bec9fd9900ed7fe4ed3fe5b3d9f56ec4ba1fe56b (diff) | |
| download | chromium_src-bd6fc2fb1af851ac7e2f4a3e08ad3a92ab6ba4af.zip chromium_src-bd6fc2fb1af851ac7e2f4a3e08ad3a92ab6ba4af.tar.gz chromium_src-bd6fc2fb1af851ac7e2f4a3e08ad3a92ab6ba4af.tar.bz2 | |
Revert 257524 "Move IsStringASCII/UTF8 to base namespace."
> Move IsStringASCII/UTF8 to base namespace.
>
> Use StringPiece for IsStringUTF8.
>
> TBR=sky
>
> Review URL: https://codereview.chromium.org/196793010
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/198163004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257533 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/mime_util.cc | 2 | ||||
| -rw-r--r-- | net/base/net_util.cc | 2 | ||||
| -rw-r--r-- | net/base/net_util_win.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc index aa648d9..2dee17d 100644 --- a/net/base/mime_util.cc +++ b/net/base/mime_util.cc @@ -640,7 +640,7 @@ static const char* legal_top_level_types[] = { bool MimeUtil::IsMimeType(const std::string& type_string) const { // MIME types are always ASCII and case-insensitive (at least, the top-level // and secondary types we care about). - if (!base::IsStringASCII(type_string)) + if (!IsStringASCII(type_string)) return false; if (type_string == "*/*" || type_string == "*") diff --git a/net/base/net_util.cc b/net/base/net_util.cc index 7e3e514..0174c65 100644 --- a/net/base/net_util.cc +++ b/net/base/net_util.cc @@ -802,7 +802,7 @@ std::string GetFileNameFromURL(const GURL& url, // The URL's path should be escaped UTF-8, but may not be. std::string decoded_filename = unescaped_url_filename; - if (!base::IsStringUTF8(decoded_filename)) { + if (!IsStringUTF8(decoded_filename)) { // TODO(jshin): this is probably not robust enough. To be sure, we need // encoding detection. base::string16 utf16_output; diff --git a/net/base/net_util_win.cc b/net/base/net_util_win.cc index 0528595..f415808 100644 --- a/net/base/net_util_win.cc +++ b/net/base/net_util_win.cc @@ -119,7 +119,7 @@ bool FileURLToFilePath(const GURL& url, base::FilePath* file_path) { path = UnescapeURLComponent(path, UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS); - if (!base::IsStringUTF8(path)) { + if (!IsStringUTF8(path)) { // Not UTF-8, assume encoding is native codepage and we're done. We know we // are giving the conversion function a nonempty string, and it may fail if // the given string is not in the current encoding and give us an empty |