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 "remoting/host/url_request_context.h" | 5 #include "remoting/host/url_request_context.h" |
6 | 6 |
7 #include "base/message_loop_proxy.h" | 7 #include "base/message_loop_proxy.h" |
8 #include "net/base/cert_verifier.h" | 8 #include "net/base/cert_verifier.h" |
9 #include "net/base/host_resolver.h" | 9 #include "net/base/host_resolver.h" |
10 #include "net/base/ssl_config_service_defaults.h" | 10 #include "net/base/ssl_config_service_defaults.h" |
(...skipping 24 matching lines...) Expand all Loading... |
35 virtual void AddObserver(Observer* observer) OVERRIDE {} | 35 virtual void AddObserver(Observer* observer) OVERRIDE {} |
36 virtual void RemoveObserver(Observer* observer) OVERRIDE {} | 36 virtual void RemoveObserver(Observer* observer) OVERRIDE {} |
37 virtual ConfigAvailability GetLatestProxyConfig( | 37 virtual ConfigAvailability GetLatestProxyConfig( |
38 net::ProxyConfig* config) OVERRIDE { | 38 net::ProxyConfig* config) OVERRIDE { |
39 *config = net::ProxyConfig::CreateDirect(); | 39 *config = net::ProxyConfig::CreateDirect(); |
40 return CONFIG_VALID; | 40 return CONFIG_VALID; |
41 } | 41 } |
42 }; | 42 }; |
43 | 43 |
44 net::ProxyConfigService* CreateSystemProxyConfigService( | 44 net::ProxyConfigService* CreateSystemProxyConfigService( |
45 base::MessageLoopProxy* ui_message_loop_, | 45 base::SingleThreadTaskRunner* ui_task_runner, |
46 base::SingleThreadTaskRunner* io_thread_task_runner, | 46 base::SingleThreadTaskRunner* io_thread_task_runner, |
47 MessageLoopForIO* file_message_loop) { | 47 MessageLoopForIO* file_message_loop) { |
48 DCHECK(ui_message_loop_->BelongsToCurrentThread()); | 48 DCHECK(ui_task_runner->BelongsToCurrentThread()); |
49 | 49 |
50 #if defined(OS_WIN) | 50 #if defined(OS_WIN) |
51 return new net::ProxyConfigServiceWin(); | 51 return new net::ProxyConfigServiceWin(); |
52 #elif defined(OS_MACOSX) | 52 #elif defined(OS_MACOSX) |
53 return new net::ProxyConfigServiceMac(io_thread_task_runner); | 53 return new net::ProxyConfigServiceMac(io_thread_task_runner); |
54 #elif defined(OS_CHROMEOS) | 54 #elif defined(OS_CHROMEOS) |
55 NOTREACHED() << "ChromeOS is not a supported target for Chromoting host"; | 55 NOTREACHED() << "ChromeOS is not a supported target for Chromoting host"; |
56 return NULL; | 56 return NULL; |
57 #elif defined(OS_LINUX) | 57 #elif defined(OS_LINUX) |
58 // TODO(sergeyu): Currently ProxyConfigServiceLinux depends on | 58 // TODO(sergeyu): Currently ProxyConfigServiceLinux depends on |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 new net::HttpNetworkSession(session_params)); | 106 new net::HttpNetworkSession(session_params)); |
107 storage_.set_http_transaction_factory( | 107 storage_.set_http_transaction_factory( |
108 new net::HttpNetworkLayer(network_session)); | 108 new net::HttpNetworkLayer(network_session)); |
109 storage_.set_net_log(net_log.release()); | 109 storage_.set_net_log(net_log.release()); |
110 } | 110 } |
111 | 111 |
112 URLRequestContext::~URLRequestContext() { | 112 URLRequestContext::~URLRequestContext() { |
113 } | 113 } |
114 | 114 |
115 URLRequestContextGetter::URLRequestContextGetter( | 115 URLRequestContextGetter::URLRequestContextGetter( |
116 base::MessageLoopProxy* ui_message_loop, | 116 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
117 MessageLoop* io_message_loop, | 117 scoped_refptr<base::SingleThreadTaskRunner> network_task_runner, |
118 MessageLoopForIO* file_message_loop) | 118 MessageLoopForIO* file_message_loop) |
119 : network_task_runner_(io_message_loop->message_loop_proxy()) { | 119 : network_task_runner_(network_task_runner) { |
120 proxy_config_service_.reset(CreateSystemProxyConfigService( | 120 proxy_config_service_.reset(CreateSystemProxyConfigService( |
121 ui_message_loop, network_task_runner_, file_message_loop)); | 121 ui_task_runner, network_task_runner_, file_message_loop)); |
122 } | 122 } |
123 | 123 |
124 net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() { | 124 net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() { |
125 if (!url_request_context_.get()) { | 125 if (!url_request_context_.get()) { |
126 url_request_context_.reset( | 126 url_request_context_.reset( |
127 new URLRequestContext(proxy_config_service_.Pass())); | 127 new URLRequestContext(proxy_config_service_.Pass())); |
128 } | 128 } |
129 return url_request_context_.get(); | 129 return url_request_context_.get(); |
130 } | 130 } |
131 | 131 |
132 scoped_refptr<base::SingleThreadTaskRunner> | 132 scoped_refptr<base::SingleThreadTaskRunner> |
133 URLRequestContextGetter::GetNetworkTaskRunner() const { | 133 URLRequestContextGetter::GetNetworkTaskRunner() const { |
134 return network_task_runner_; | 134 return network_task_runner_; |
135 } | 135 } |
136 | 136 |
137 URLRequestContextGetter::~URLRequestContextGetter() {} | 137 URLRequestContextGetter::~URLRequestContextGetter() { |
| 138 } |
138 | 139 |
139 } // namespace remoting | 140 } // namespace remoting |
OLD | NEW |