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 "components/cronet/android/url_request_context_adapter.h" | 5 #include "components/cronet/android/url_request_context_adapter.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <limits> | 10 #include <limits> |
11 #include <utility> | 11 #include <utility> |
12 | 12 |
13 #include "base/bind.h" | 13 #include "base/bind.h" |
14 #include "base/files/file_util.h" | 14 #include "base/files/file_util.h" |
15 #include "base/files/scoped_file.h" | 15 #include "base/files/scoped_file.h" |
| 16 #include "base/lazy_instance.h" |
16 #include "base/macros.h" | 17 #include "base/macros.h" |
17 #include "base/memory/ptr_util.h" | 18 #include "base/memory/ptr_util.h" |
18 #include "base/message_loop/message_loop.h" | 19 #include "base/message_loop/message_loop.h" |
19 #include "base/single_thread_task_runner.h" | 20 #include "base/single_thread_task_runner.h" |
20 #include "base/time/time.h" | 21 #include "base/time/time.h" |
21 #include "components/cronet/url_request_context_config.h" | 22 #include "components/cronet/url_request_context_config.h" |
22 #include "net/android/network_change_notifier_factory_android.h" | 23 #include "net/android/network_change_notifier_factory_android.h" |
23 #include "net/base/net_errors.h" | 24 #include "net/base/net_errors.h" |
24 #include "net/base/network_change_notifier.h" | 25 #include "net/base/network_change_notifier.h" |
25 #include "net/base/network_delegate_impl.h" | 26 #include "net/base/network_delegate_impl.h" |
26 #include "net/base/url_util.h" | 27 #include "net/base/url_util.h" |
27 #include "net/cert/cert_verifier.h" | 28 #include "net/cert/cert_verifier.h" |
28 #include "net/http/http_auth_handler_factory.h" | 29 #include "net/http/http_auth_handler_factory.h" |
29 #include "net/http/http_network_layer.h" | 30 #include "net/http/http_network_layer.h" |
30 #include "net/http/http_server_properties.h" | 31 #include "net/http/http_server_properties.h" |
31 #include "net/log/write_to_file_net_log_observer.h" | 32 #include "net/log/write_to_file_net_log_observer.h" |
32 #include "net/proxy/proxy_service.h" | 33 #include "net/proxy/proxy_service.h" |
33 #include "net/sdch/sdch_owner.h" | 34 #include "net/sdch/sdch_owner.h" |
34 #include "net/ssl/ssl_config_service_defaults.h" | 35 #include "net/ssl/ssl_config_service_defaults.h" |
35 #include "net/url_request/static_http_user_agent_settings.h" | 36 #include "net/url_request/static_http_user_agent_settings.h" |
36 #include "net/url_request/url_request_context_builder.h" | 37 #include "net/url_request/url_request_context_builder.h" |
37 #include "net/url_request/url_request_context_storage.h" | 38 #include "net/url_request/url_request_context_storage.h" |
38 #include "net/url_request/url_request_job_factory_impl.h" | 39 #include "net/url_request/url_request_job_factory_impl.h" |
39 #include "url/scheme_host_port.h" | 40 #include "url/scheme_host_port.h" |
40 | 41 |
41 namespace { | 42 namespace { |
42 | 43 |
| 44 // Use a global NetLog instance. See crbug.com/486120. |
| 45 static base::LazyInstance<net::NetLog>::Leaky g_net_log = |
| 46 LAZY_INSTANCE_INITIALIZER; |
| 47 |
43 class BasicNetworkDelegate : public net::NetworkDelegateImpl { | 48 class BasicNetworkDelegate : public net::NetworkDelegateImpl { |
44 public: | 49 public: |
45 BasicNetworkDelegate() {} | 50 BasicNetworkDelegate() {} |
46 ~BasicNetworkDelegate() override {} | 51 ~BasicNetworkDelegate() override {} |
47 | 52 |
48 private: | 53 private: |
49 // net::NetworkDelegate implementation. | 54 // net::NetworkDelegate implementation. |
50 int OnBeforeURLRequest(net::URLRequest* request, | 55 int OnBeforeURLRequest(net::URLRequest* request, |
51 const net::CompletionCallback& callback, | 56 const net::CompletionCallback& callback, |
52 GURL* new_url) override { | 57 GURL* new_url) override { |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
143 | 148 |
144 void URLRequestContextAdapter::InitRequestContextOnNetworkThread() { | 149 void URLRequestContextAdapter::InitRequestContextOnNetworkThread() { |
145 DCHECK(GetNetworkTaskRunner()->BelongsToCurrentThread()); | 150 DCHECK(GetNetworkTaskRunner()->BelongsToCurrentThread()); |
146 DCHECK(config_); | 151 DCHECK(config_); |
147 // TODO(mmenke): Add method to have the builder enable SPDY. | 152 // TODO(mmenke): Add method to have the builder enable SPDY. |
148 net::URLRequestContextBuilder context_builder; | 153 net::URLRequestContextBuilder context_builder; |
149 | 154 |
150 context_builder.set_network_delegate( | 155 context_builder.set_network_delegate( |
151 base::WrapUnique(new BasicNetworkDelegate())); | 156 base::WrapUnique(new BasicNetworkDelegate())); |
152 context_builder.set_proxy_config_service(std::move(proxy_config_service_)); | 157 context_builder.set_proxy_config_service(std::move(proxy_config_service_)); |
153 config_->ConfigureURLRequestContextBuilder(&context_builder, nullptr, | 158 config_->ConfigureURLRequestContextBuilder(&context_builder, |
154 nullptr); | 159 g_net_log.Pointer(), nullptr); |
155 | 160 |
156 context_ = context_builder.Build(); | 161 context_ = context_builder.Build(); |
157 | 162 |
158 if (config_->enable_sdch) { | 163 if (config_->enable_sdch) { |
159 DCHECK(context_->sdch_manager()); | 164 DCHECK(context_->sdch_manager()); |
160 sdch_owner_.reset( | 165 sdch_owner_.reset( |
161 new net::SdchOwner(context_->sdch_manager(), context_.get())); | 166 new net::SdchOwner(context_->sdch_manager(), context_.get())); |
162 } | 167 } |
163 | 168 |
164 if (config_->enable_quic) { | 169 if (config_->enable_quic) { |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
309 write_to_file_observer_.reset(); | 314 write_to_file_observer_.reset(); |
310 } | 315 } |
311 } | 316 } |
312 | 317 |
313 void NetLogObserver::OnAddEntry(const net::NetLog::Entry& entry) { | 318 void NetLogObserver::OnAddEntry(const net::NetLog::Entry& entry) { |
314 VLOG(2) << "Net log entry: type=" << entry.type() | 319 VLOG(2) << "Net log entry: type=" << entry.type() |
315 << ", source=" << entry.source().type << ", phase=" << entry.phase(); | 320 << ", source=" << entry.source().type << ", phase=" << entry.phase(); |
316 } | 321 } |
317 | 322 |
318 } // namespace cronet | 323 } // namespace cronet |
OLD | NEW |