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/proxy/proxy_resolver_v8.cc | |
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/proxy/proxy_resolver_v8.cc')
-rw-r--r-- | net/proxy/proxy_resolver_v8.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/proxy/proxy_resolver_v8.cc b/net/proxy/proxy_resolver_v8.cc index 3de1c7a..4571c4e 100644 --- a/net/proxy/proxy_resolver_v8.cc +++ b/net/proxy/proxy_resolver_v8.cc @@ -233,7 +233,7 @@ bool GetHostnameArgument(const v8::FunctionCallbackInfo<v8::Value>& args, // |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_output.data(), + bool success = base::UTF16ToUTF8(punycode_output.data(), punycode_output.length(), hostname); DCHECK(success); @@ -372,7 +372,7 @@ class ProxyResolverV8::Context { v8::Local<v8::Value> function; if (!GetFindProxyForURL(&function)) { js_bindings()->OnError( - -1, ASCIIToUTF16("FindProxyForURL() is undefined.")); + -1, base::ASCIIToUTF16("FindProxyForURL() is undefined.")); return ERR_PAC_SCRIPT_FAILED; } @@ -392,7 +392,7 @@ class ProxyResolverV8::Context { if (!ret->IsString()) { js_bindings()->OnError( - -1, ASCIIToUTF16("FindProxyForURL() did not return a string.")); + -1, base::ASCIIToUTF16("FindProxyForURL() did not return a string.")); return ERR_PAC_SCRIPT_FAILED; } @@ -404,8 +404,8 @@ class ProxyResolverV8::Context { // converting them to ASCII punycode. // crbug.com/47234 base::string16 error_message = - ASCIIToUTF16("FindProxyForURL() returned a non-ASCII string " - "(crbug.com/47234): ") + ret_str; + base::ASCIIToUTF16("FindProxyForURL() returned a non-ASCII string " + "(crbug.com/47234): ") + ret_str; js_bindings()->OnError(-1, error_message); return ERR_PAC_SCRIPT_FAILED; } @@ -496,7 +496,7 @@ class ProxyResolverV8::Context { v8::Local<v8::Value> function; if (!GetFindProxyForURL(&function)) { js_bindings()->OnError( - -1, ASCIIToUTF16("FindProxyForURL() is undefined.")); + -1, base::ASCIIToUTF16("FindProxyForURL() is undefined.")); return ERR_PAC_SCRIPT_FAILED; } @@ -564,7 +564,7 @@ class ProxyResolverV8::Context { // disregard any arguments beyond the first. base::string16 message; if (args.Length() == 0) { - message = ASCIIToUTF16("undefined"); + message = base::ASCIIToUTF16("undefined"); } else { if (!V8ObjectToUTF16String(args[0], &message, args.GetIsolate())) return; // toString() threw an exception. |