Commit 14ec5696 authored by Lily Houghton's avatar Lily Houghton Committed by Commit Bot

Rename proxy_resolver_script.h --> pac_js_library.h

Bug: 613650
Change-Id: I8674c107d619895ff7c752b4cf4397b7553b310e
Reviewed-on: https://chromium-review.googlesource.com/820158
Commit-Queue: Lily Houghton <lilyhoughton@chromium.org>
Reviewed-by: default avatarEric Roman <eroman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523775}
parent a7a0c21c
...@@ -1045,6 +1045,7 @@ component("net") { ...@@ -1045,6 +1045,7 @@ component("net") {
"proxy/multi_threaded_proxy_resolver.h", "proxy/multi_threaded_proxy_resolver.h",
"proxy/network_delegate_error_observer.cc", "proxy/network_delegate_error_observer.cc",
"proxy/network_delegate_error_observer.h", "proxy/network_delegate_error_observer.h",
"proxy/pac_js_library.h",
"proxy/polling_proxy_config_service.cc", "proxy/polling_proxy_config_service.cc",
"proxy/polling_proxy_config_service.h", "proxy/polling_proxy_config_service.h",
"proxy/proxy_bypass_rules.cc", "proxy/proxy_bypass_rules.cc",
...@@ -1076,7 +1077,6 @@ component("net") { ...@@ -1076,7 +1077,6 @@ component("net") {
"proxy/proxy_resolver_factory.h", "proxy/proxy_resolver_factory.h",
"proxy/proxy_resolver_mac.cc", "proxy/proxy_resolver_mac.cc",
"proxy/proxy_resolver_mac.h", "proxy/proxy_resolver_mac.h",
"proxy/proxy_resolver_script.h",
"proxy/proxy_resolver_script_data.cc", "proxy/proxy_resolver_script_data.cc",
"proxy/proxy_resolver_script_data.h", "proxy/proxy_resolver_script_data.h",
"proxy/proxy_resolver_winhttp.cc", "proxy/proxy_resolver_winhttp.cc",
......
This diff is collapsed.
This diff is collapsed.
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
#include "gin/v8_initializer.h" #include "gin/v8_initializer.h"
#include "net/base/ip_address.h" #include "net/base/ip_address.h"
#include "net/base/net_errors.h" #include "net/base/net_errors.h"
#include "net/proxy/pac_js_library.h"
#include "net/proxy/proxy_info.h" #include "net/proxy/proxy_info.h"
#include "net/proxy/proxy_resolver_script.h"
#include "net/proxy/proxy_resolver_script_data.h" #include "net/proxy/proxy_resolver_script_data.h"
#include "url/gurl.h" #include "url/gurl.h"
#include "url/url_canon.h" #include "url/url_canon.h"
...@@ -34,8 +34,7 @@ ...@@ -34,8 +34,7 @@
// Notes on the javascript environment: // Notes on the javascript environment:
// //
// For the majority of the PAC utility functions, we use the same code // For the majority of the PAC utility functions, we use the same code
// as Firefox. See the javascript library that proxy_resolver_scipt.h // as Firefox. See the javascript library that pac_js_library.h pulls in.
// pulls in.
// //
// In addition, we implement a subset of Microsoft's extensions to PAC. // In addition, we implement a subset of Microsoft's extensions to PAC.
// - myIpAddressEx() // - myIpAddressEx()
...@@ -573,10 +572,7 @@ class ProxyResolverV8::Context { ...@@ -573,10 +572,7 @@ class ProxyResolverV8::Context {
// (This script should never fail, as it is a string literal!) // (This script should never fail, as it is a string literal!)
// Note that the two string literals are concatenated. // Note that the two string literals are concatenated.
int rv = RunScript( int rv = RunScript(
ASCIILiteralToV8String( ASCIILiteralToV8String(isolate_, PAC_JS_LIBRARY PAC_JS_LIBRARY_EX),
isolate_,
PROXY_RESOLVER_SCRIPT
PROXY_RESOLVER_SCRIPT_EX),
kPacUtilityResourceName); kPacUtilityResourceName);
if (rv != OK) { if (rv != OK) {
NOTREACHED(); NOTREACHED();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment