Index: chrome/browser/net/connection_tester.cc |
diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc |
index f5e892b6dcb05b187d575d71b365806386729b40..2842d79c93189a3b57cc3fd2ff87226bf7b998a5 100644 |
--- a/chrome/browser/net/connection_tester.cc |
+++ b/chrome/browser/net/connection_tester.cc |
@@ -87,6 +87,7 @@ class ExperimentURLRequestContext : public net::URLRequestContext { |
int Init(const ConnectionTester::Experiment& experiment, |
scoped_ptr<net::ProxyConfigService>* proxy_config_service, |
+ v8::Isolate* v8_default_isolate, |
net::NetLog* net_log) { |
int rv; |
@@ -101,7 +102,8 @@ class ExperimentURLRequestContext : public net::URLRequestContext { |
// Create a custom ProxyService for this this experiment. |
scoped_ptr<net::ProxyService> experiment_proxy_service; |
rv = CreateProxyService(experiment.proxy_settings_experiment, |
- proxy_config_service, &experiment_proxy_service); |
+ proxy_config_service, &experiment_proxy_service, |
+ v8_default_isolate); |
if (rv != net::OK) |
return rv; // Failure. |
storage_.set_proxy_service(experiment_proxy_service.release()); |
@@ -184,7 +186,8 @@ class ExperimentURLRequestContext : public net::URLRequestContext { |
int CreateProxyService( |
ConnectionTester::ProxySettingsExperiment experiment, |
scoped_ptr<net::ProxyConfigService>* proxy_config_service, |
- scoped_ptr<net::ProxyService>* experiment_proxy_service) { |
+ scoped_ptr<net::ProxyService>* experiment_proxy_service, |
+ v8::Isolate* v8_default_isolate) { |
if (CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kSingleProcess)) { |
// We can't create a standard proxy resolver in single-process mode. |
@@ -211,7 +214,8 @@ class ExperimentURLRequestContext : public net::URLRequestContext { |
dhcp_factory.Create(proxy_request_context_), |
host_resolver(), |
NULL, |
- NULL)); |
+ NULL, |
+ v8_default_isolate)); |
#endif |
return net::OK; |
@@ -410,6 +414,7 @@ void ConnectionTester::TestRunner::ProxyConfigServiceCreated( |
if (status == net::OK) |
status = request_context_->Init(experiment, |
proxy_config_service, |
+ tester_->v8_default_isolate_, |
net_log_); |
if (status != net::OK) { |
tester_->OnExperimentCompleted(status); |
@@ -442,12 +447,15 @@ void ConnectionTester::TestRunner::Run(const Experiment& experiment) { |
ConnectionTester::ConnectionTester( |
Delegate* delegate, |
net::URLRequestContext* proxy_request_context, |
- net::NetLog* net_log) |
+ net::NetLog* net_log, |
+ v8::Isolate* v8_default_isolate) |
: delegate_(delegate), |
proxy_request_context_(proxy_request_context), |
- net_log_(net_log) { |
+ net_log_(net_log), |
+ v8_default_isolate_(v8_default_isolate) { |
DCHECK(delegate); |
DCHECK(proxy_request_context); |
+ DCHECK(v8_default_isolate); |
} |
ConnectionTester::~ConnectionTester() { |