| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/net/connection_tester.h" | 5 #include "chrome/browser/net/connection_tester.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 } | 199 } |
| 200 | 200 |
| 201 #if defined(OS_IOS) | 201 #if defined(OS_IOS) |
| 202 experiment_proxy_service->reset( | 202 experiment_proxy_service->reset( |
| 203 net::ProxyService::CreateUsingSystemProxyResolver( | 203 net::ProxyService::CreateUsingSystemProxyResolver( |
| 204 proxy_config_service->release(), 0u, NULL)); | 204 proxy_config_service->release(), 0u, NULL)); |
| 205 #else | 205 #else |
| 206 experiment_proxy_service->reset( | 206 experiment_proxy_service->reset( |
| 207 net::CreateProxyServiceUsingV8ProxyResolver( | 207 net::CreateProxyServiceUsingV8ProxyResolver( |
| 208 proxy_config_service->release(), | 208 proxy_config_service->release(), |
| 209 0u, | |
| 210 new net::ProxyScriptFetcherImpl(proxy_request_context_), | 209 new net::ProxyScriptFetcherImpl(proxy_request_context_), |
| 211 dhcp_factory.Create(proxy_request_context_), | 210 dhcp_factory.Create(proxy_request_context_), |
| 212 host_resolver(), | 211 host_resolver(), |
| 213 NULL, | 212 NULL, |
| 214 NULL)); | 213 NULL)); |
| 215 #endif | 214 #endif |
| 216 | 215 |
| 217 return net::OK; | 216 return net::OK; |
| 218 } | 217 } |
| 219 | 218 |
| (...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 538 | 537 |
| 539 // Notify the delegate of completion. | 538 // Notify the delegate of completion. |
| 540 delegate_->OnCompletedConnectionTestExperiment(current, result); | 539 delegate_->OnCompletedConnectionTestExperiment(current, result); |
| 541 | 540 |
| 542 if (remaining_experiments_.empty()) { | 541 if (remaining_experiments_.empty()) { |
| 543 delegate_->OnCompletedConnectionTestSuite(); | 542 delegate_->OnCompletedConnectionTestSuite(); |
| 544 } else { | 543 } else { |
| 545 StartNextExperiment(); | 544 StartNextExperiment(); |
| 546 } | 545 } |
| 547 } | 546 } |
| OLD | NEW |