diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 18:18:01 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 18:18:01 +0000 |
| commit | ad65a3ee540552ecca50ebbf9382f1a4c718d383 (patch) | |
| tree | 68082d6d78331413eba2f799547026940c07e004 /net/dns | |
| parent | 750f4497a3b87a4a028d4d6ce3ce88e01314139c (diff) | |
| download | chromium_src-ad65a3ee540552ecca50ebbf9382f1a4c718d383.zip chromium_src-ad65a3ee540552ecca50ebbf9382f1a4c718d383.tar.gz chromium_src-ad65a3ee540552ecca50ebbf9382f1a4c718d383.tar.bz2 | |
Update uses of UTF conversions in courgette/, device/, extensions/, google_apis/, gpu/, ipc/, media/, net/ to use the base:: namespace.
BUG=330556
TEST=no change
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/112963005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/dns')
| -rw-r--r-- | net/dns/dns_config_service_win.cc | 2 | ||||
| -rw-r--r-- | net/dns/host_resolver_impl.cc | 2 |
2 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 fe97b74..15ae222 100644 --- a/net/dns/dns_config_service_win.cc +++ b/net/dns/dns_config_service_win.cc @@ -153,7 +153,7 @@ bool ParseDomainASCII(const base::string16& widestr, std::string* domain) { // |punycode_output| should now be ASCII; convert it to a std::string. // (We could use UTF16ToASCII() instead, but that requires an extra string // copy. Since ASCII is a subset of UTF8 the following is equivalent). - bool success = UTF16ToUTF8(punycode.data(), punycode.length(), domain); + bool success = base::UTF16ToUTF8(punycode.data(), punycode.length(), domain); DCHECK(success); DCHECK(IsStringASCII(*domain)); return success && !domain->empty(); diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc index 57ab3d6..f90df04 100644 --- a/net/dns/host_resolver_impl.cc +++ b/net/dns/host_resolver_impl.cc @@ -307,7 +307,7 @@ base::Value* NetLogProcTaskFailedCallback(uint32 attempt_number, (LPWSTR)&error_string, 0, // Buffer size. 0); // Arguments (unused). - dict->SetString("os_error_string", WideToUTF8(error_string)); + dict->SetString("os_error_string", base::WideToUTF8(error_string)); LocalFree(error_string); #endif } |