Merge "Use the --no-icu_case_mapping flag when initializing V8"
am: 9c6572d549
Change-Id: If665e05a6e4faf2ddd5466d11fb45917a3c3c2ee
diff --git a/src/proxy_resolver_v8.cc b/src/proxy_resolver_v8.cc
index f978694..e37334c 100644
--- a/src/proxy_resolver_v8.cc
+++ b/src/proxy_resolver_v8.cc
@@ -762,6 +762,12 @@
if (script_data.size() == 0)
return ERR_PAC_SCRIPT_FAILED;
+ // Use the built-in locale-aware definitions instead of the ones provided by
+ // ICU. This makes things like String.prototype.toUpperCase() not be
+ // undefined.
+ static const char kNoIcuCaseMapping[] = "--no-icu_case_mapping";
+ v8::V8::SetFlagsFromString(kNoIcuCaseMapping, strlen(kNoIcuCaseMapping));
+
// Try parsing the PAC script.
ArrayBufferAllocator allocator;
v8::Isolate::CreateParams create_params;
