summaryrefslogtreecommitdiffstats
path: root/net/proxy/proxy_service.cc
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-10 21:27:00 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-10 21:27:00 +0000
commit52ae80c40de68f97f535d718fbbc086d5698c870 (patch)
tree775060ff843b19b6c589cd1395aaf42bf766f190 /net/proxy/proxy_service.cc
parente7de7b8167ec1e264e15780bd7a2fb3f40a7138d (diff)
downloadchromium_src-52ae80c40de68f97f535d718fbbc086d5698c870.zip
chromium_src-52ae80c40de68f97f535d718fbbc086d5698c870.tar.gz
chromium_src-52ae80c40de68f97f535d718fbbc086d5698c870.tar.bz2
Add trace points for the "dnsResolve()" and "myIpAddress()" PAC javascript bindings.
This makes note of the calls in the request's LoadLog. Since the LoadLog is not thread-safe, SingleThreadedProxyResolver creates a private LoadLog for ProxyResolverV8 to write into, and then copies it into the mainLoadLog on completion (on the origin thread). BUG=http://crbug.com/14478 Review URL: http://codereview.chromium.org/193037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25926 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_service.cc')
-rw-r--r--net/proxy/proxy_service.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index 46509c2..637fbbd 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -54,7 +54,8 @@ class ProxyResolverNull : public ProxyResolver {
virtual int GetProxyForURL(const GURL& url,
ProxyInfo* results,
CompletionCallback* callback,
- RequestHandle* request) {
+ RequestHandle* request,
+ LoadLog* load_log) {
return ERR_NOT_IMPLEMENTED;
}
@@ -99,11 +100,8 @@ class ProxyService::PacRequest
config_id_ = service_->config_.id();
- // TODO(eroman): ProxyResolver::GetProxyForURL should take LoadLog*.
- // Then we can pass in |load_log_| and understand how much time is
- // spent in bindings like dnsResolve()!
return resolver()->GetProxyForURL(
- url_, results_, &io_callback_, &resolve_job_/*, load_log_*/);
+ url_, results_, &io_callback_, &resolve_job_, load_log_);
}
bool is_started() const {