diff options
Diffstat (limited to 'net/proxy/proxy_resolver_v8.cc')
-rw-r--r-- | net/proxy/proxy_resolver_v8.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/proxy/proxy_resolver_v8.cc b/net/proxy/proxy_resolver_v8.cc index 9011875..0c08027 100644 --- a/net/proxy/proxy_resolver_v8.cc +++ b/net/proxy/proxy_resolver_v8.cc @@ -112,7 +112,7 @@ class V8ExternalASCIILiteral : public v8::String::ExternalAsciiStringResource { // throughout this object's lifetime. V8ExternalASCIILiteral(const char* ascii, size_t length) : ascii_(ascii), length_(length) { - DCHECK(IsStringASCII(ascii)); + DCHECK(base::IsStringASCII(ascii)); } virtual const char* data() const OVERRIDE { @@ -159,7 +159,7 @@ base::string16 V8StringToUTF16(v8::Handle<v8::String> s) { // Converts an ASCII std::string to a V8 string. v8::Local<v8::String> ASCIIStringToV8String(v8::Isolate* isolate, const std::string& s) { - DCHECK(IsStringASCII(s)); + DCHECK(base::IsStringASCII(s)); return v8::String::NewFromUtf8(isolate, s.data(), v8::String::kNormalString, s.size()); } @@ -182,7 +182,7 @@ v8::Local<v8::String> ScriptDataToV8String( // Converts an ASCII string literal to a V8 string. v8::Local<v8::String> ASCIILiteralToV8String(v8::Isolate* isolate, const char* ascii) { - DCHECK(IsStringASCII(ascii)); + DCHECK(base::IsStringASCII(ascii)); size_t length = strlen(ascii); if (length <= kMaxStringBytesForCopy) return v8::String::NewFromUtf8(isolate, ascii, v8::String::kNormalString, @@ -218,7 +218,7 @@ bool GetHostnameArgument(const v8::FunctionCallbackInfo<v8::Value>& args, const base::string16 hostname_utf16 = V8StringToUTF16(args[0]->ToString()); // If the hostname is already in ASCII, simply return it as is. - if (IsStringASCII(hostname_utf16)) { + if (base::IsStringASCII(hostname_utf16)) { *hostname = base::UTF16ToASCII(hostname_utf16); return true; } @@ -238,7 +238,7 @@ bool GetHostnameArgument(const v8::FunctionCallbackInfo<v8::Value>& args, punycode_output.length(), hostname); DCHECK(success); - DCHECK(IsStringASCII(*hostname)); + DCHECK(base::IsStringASCII(*hostname)); return success; } @@ -399,7 +399,7 @@ class ProxyResolverV8::Context { base::string16 ret_str = V8StringToUTF16(ret->ToString()); - if (!IsStringASCII(ret_str)) { + if (!base::IsStringASCII(ret_str)) { // TODO(eroman): Rather than failing when a wide string is returned, we // could extend the parsing to handle IDNA hostnames by // converting them to ASCII punycode. @@ -661,7 +661,7 @@ class ProxyResolverV8::Context { } std::string ip_address_list = V8StringToUTF8(args[0]->ToString()); - if (!IsStringASCII(ip_address_list)) { + if (!base::IsStringASCII(ip_address_list)) { args.GetReturnValue().SetNull(); return; } @@ -686,12 +686,12 @@ class ProxyResolverV8::Context { } std::string ip_address = V8StringToUTF8(args[0]->ToString()); - if (!IsStringASCII(ip_address)) { + if (!base::IsStringASCII(ip_address)) { args.GetReturnValue().Set(false); return; } std::string ip_prefix = V8StringToUTF8(args[1]->ToString()); - if (!IsStringASCII(ip_prefix)) { + if (!base::IsStringASCII(ip_prefix)) { args.GetReturnValue().Set(false); return; } |