| 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 "net/url_request/url_request_context_builder.h" | 5 #include "net/url_request/url_request_context_builder.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 #if defined(OS_LINUX) || defined(OS_ANDROID) | 268 #if defined(OS_LINUX) || defined(OS_ANDROID) |
| 269 ProxyConfigService* proxy_config_service = proxy_config_service_.release(); | 269 ProxyConfigService* proxy_config_service = proxy_config_service_.release(); |
| 270 #else | 270 #else |
| 271 ProxyConfigService* proxy_config_service = NULL; | 271 ProxyConfigService* proxy_config_service = NULL; |
| 272 if (proxy_config_service_) { | 272 if (proxy_config_service_) { |
| 273 proxy_config_service = proxy_config_service_.release(); | 273 proxy_config_service = proxy_config_service_.release(); |
| 274 } else { | 274 } else { |
| 275 proxy_config_service = | 275 proxy_config_service = |
| 276 ProxyService::CreateSystemProxyConfigService( | 276 ProxyService::CreateSystemProxyConfigService( |
| 277 base::ThreadTaskRunnerHandle::Get().get(), | 277 base::ThreadTaskRunnerHandle::Get().get(), |
| 278 context->GetFileThread()->message_loop()); | 278 context->GetFileThread()->task_runner()); |
| 279 } | 279 } |
| 280 #endif // defined(OS_LINUX) || defined(OS_ANDROID) | 280 #endif // defined(OS_LINUX) || defined(OS_ANDROID) |
| 281 proxy_service_.reset( | 281 proxy_service_.reset( |
| 282 ProxyService::CreateUsingSystemProxyResolver( | 282 ProxyService::CreateUsingSystemProxyResolver( |
| 283 proxy_config_service, | 283 proxy_config_service, |
| 284 0, // This results in using the default value. | 284 0, // This results in using the default value. |
| 285 context->net_log())); | 285 context->net_log())); |
| 286 } | 286 } |
| 287 storage->set_proxy_service(proxy_service_.release()); | 287 storage->set_proxy_service(proxy_service_.release()); |
| 288 | 288 |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 402 #endif // !defined(DISABLE_FTP_SUPPORT) | 402 #endif // !defined(DISABLE_FTP_SUPPORT) |
| 403 | 403 |
| 404 storage->set_job_factory(job_factory); | 404 storage->set_job_factory(job_factory); |
| 405 | 405 |
| 406 // TODO(willchan): Support sdch. | 406 // TODO(willchan): Support sdch. |
| 407 | 407 |
| 408 return context; | 408 return context; |
| 409 } | 409 } |
| 410 | 410 |
| 411 } // namespace net | 411 } // namespace net |
| OLD | NEW |