summaryrefslogtreecommitdiffstats
path: root/net/dns
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-17 23:55:43 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-17 23:55:43 +0000
commitbd6fc2fb1af851ac7e2f4a3e08ad3a92ab6ba4af (patch)
treedb093d44a2b6964ae5b54b140bdef71a8b7a337d /net/dns
parentbec9fd9900ed7fe4ed3fe5b3d9f56ec4ba1fe56b (diff)
downloadchromium_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/dns')
-rw-r--r--net/dns/dns_config_service_win.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dns/dns_config_service_win.cc b/net/dns/dns_config_service_win.cc
index 8d92ca6..be7e771 100644
--- a/net/dns/dns_config_service_win.cc
+++ b/net/dns/dns_config_service_win.cc
@@ -139,7 +139,7 @@ bool ParseDomainASCII(const base::string16& widestr, std::string* domain) {
return false;
// Check if already ASCII.
- if (base::IsStringASCII(widestr)) {
+ if (IsStringASCII(widestr)) {
*domain = base::UTF16ToASCII(widestr);
return true;
}
@@ -155,7 +155,7 @@ bool ParseDomainASCII(const base::string16& widestr, std::string* domain) {
// copy. Since ASCII is a subset of UTF8 the following is equivalent).
bool success = base::UTF16ToUTF8(punycode.data(), punycode.length(), domain);
DCHECK(success);
- DCHECK(base::IsStringASCII(*domain));
+ DCHECK(IsStringASCII(*domain));
return success && !domain->empty();
}