Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(143)

Unified Diff: trunk/src/net/proxy/proxy_resolver_v8.cc

Issue 198163004: Revert 257524 "Move IsStringASCII/UTF8 to base namespace." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/net/http/http_content_disposition.cc ('k') | trunk/src/ppapi/shared_impl/dictionary_var.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/net/proxy/proxy_resolver_v8.cc
===================================================================
--- trunk/src/net/proxy/proxy_resolver_v8.cc (revision 257532)
+++ trunk/src/net/proxy/proxy_resolver_v8.cc (working copy)
@@ -110,7 +110,7 @@
// throughout this object's lifetime.
V8ExternalASCIILiteral(const char* ascii, size_t length)
: ascii_(ascii), length_(length) {
- DCHECK(base::IsStringASCII(ascii));
+ DCHECK(IsStringASCII(ascii));
}
virtual const char* data() const OVERRIDE {
@@ -157,7 +157,7 @@
// Converts an ASCII std::string to a V8 string.
v8::Local<v8::String> ASCIIStringToV8String(v8::Isolate* isolate,
const std::string& s) {
- DCHECK(base::IsStringASCII(s));
+ DCHECK(IsStringASCII(s));
return v8::String::NewFromUtf8(isolate, s.data(), v8::String::kNormalString,
s.size());
}
@@ -180,7 +180,7 @@
// Converts an ASCII string literal to a V8 string.
v8::Local<v8::String> ASCIILiteralToV8String(v8::Isolate* isolate,
const char* ascii) {
- DCHECK(base::IsStringASCII(ascii));
+ DCHECK(IsStringASCII(ascii));
size_t length = strlen(ascii);
if (length <= kMaxStringBytesForCopy)
return v8::String::NewFromUtf8(isolate, ascii, v8::String::kNormalString,
@@ -216,7 +216,7 @@
const base::string16 hostname_utf16 = V8StringToUTF16(args[0]->ToString());
// If the hostname is already in ASCII, simply return it as is.
- if (base::IsStringASCII(hostname_utf16)) {
+ if (IsStringASCII(hostname_utf16)) {
*hostname = base::UTF16ToASCII(hostname_utf16);
return true;
}
@@ -237,7 +237,7 @@
punycode_output.length(),
hostname);
DCHECK(success);
- DCHECK(base::IsStringASCII(*hostname));
+ DCHECK(IsStringASCII(*hostname));
return success;
}
@@ -398,7 +398,7 @@
base::string16 ret_str = V8StringToUTF16(ret->ToString());
- if (!base::IsStringASCII(ret_str)) {
+ if (!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.
@@ -660,7 +660,7 @@
}
std::string ip_address_list = V8StringToUTF8(args[0]->ToString());
- if (!base::IsStringASCII(ip_address_list)) {
+ if (!IsStringASCII(ip_address_list)) {
args.GetReturnValue().SetNull();
return;
}
@@ -685,12 +685,12 @@
}
std::string ip_address = V8StringToUTF8(args[0]->ToString());
- if (!base::IsStringASCII(ip_address)) {
+ if (!IsStringASCII(ip_address)) {
args.GetReturnValue().Set(false);
return;
}
std::string ip_prefix = V8StringToUTF8(args[1]->ToString());
- if (!base::IsStringASCII(ip_prefix)) {
+ if (!IsStringASCII(ip_prefix)) {
args.GetReturnValue().Set(false);
return;
}
« no previous file with comments | « trunk/src/net/http/http_content_disposition.cc ('k') | trunk/src/ppapi/shared_impl/dictionary_var.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698