OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/service/net/service_url_request_context_getter.h" | 5 #include "chrome/service/net/service_url_request_context_getter.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 #include <utility> |
8 | 9 |
9 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
10 #include "base/single_thread_task_runner.h" | 11 #include "base/single_thread_task_runner.h" |
11 #include "base/strings/stringprintf.h" | 12 #include "base/strings/stringprintf.h" |
12 #include "base/sys_info.h" | 13 #include "base/sys_info.h" |
13 #include "build/build_config.h" | 14 #include "build/build_config.h" |
14 #include "chrome/service/service_process.h" | 15 #include "chrome/service/service_process.h" |
15 #include "components/version_info/version_info.h" | 16 #include "components/version_info/version_info.h" |
16 #include "net/proxy/proxy_config_service.h" | 17 #include "net/proxy/proxy_config_service.h" |
17 #include "net/proxy/proxy_service.h" | 18 #include "net/proxy/proxy_service.h" |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 g_service_process->io_task_runner(), | 105 g_service_process->io_task_runner(), |
105 g_service_process->file_task_runner()); | 106 g_service_process->file_task_runner()); |
106 } | 107 } |
107 | 108 |
108 net::URLRequestContext* | 109 net::URLRequestContext* |
109 ServiceURLRequestContextGetter::GetURLRequestContext() { | 110 ServiceURLRequestContextGetter::GetURLRequestContext() { |
110 if (!url_request_context_.get()) { | 111 if (!url_request_context_.get()) { |
111 net::URLRequestContextBuilder builder; | 112 net::URLRequestContextBuilder builder; |
112 builder.set_user_agent(user_agent_); | 113 builder.set_user_agent(user_agent_); |
113 builder.set_accept_language("en-us,fr"); | 114 builder.set_accept_language("en-us,fr"); |
114 builder.set_proxy_config_service(proxy_config_service_.Pass()); | 115 builder.set_proxy_config_service(std::move(proxy_config_service_)); |
115 builder.set_throttling_enabled(true); | 116 builder.set_throttling_enabled(true); |
116 url_request_context_ = builder.Build().Pass(); | 117 url_request_context_ = builder.Build(); |
117 } | 118 } |
118 return url_request_context_.get(); | 119 return url_request_context_.get(); |
119 } | 120 } |
120 | 121 |
121 scoped_refptr<base::SingleThreadTaskRunner> | 122 scoped_refptr<base::SingleThreadTaskRunner> |
122 ServiceURLRequestContextGetter::GetNetworkTaskRunner() const { | 123 ServiceURLRequestContextGetter::GetNetworkTaskRunner() const { |
123 return network_task_runner_; | 124 return network_task_runner_; |
124 } | 125 } |
125 | 126 |
126 ServiceURLRequestContextGetter::~ServiceURLRequestContextGetter() {} | 127 ServiceURLRequestContextGetter::~ServiceURLRequestContextGetter() {} |
OLD | NEW |