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/cronet_url_request_context_adapter.h" | 5 #include "components/cronet/android/cronet_url_request_context_adapter.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
9 #include "base/single_thread_task_runner.h" | 9 #include "base/single_thread_task_runner.h" |
10 #include "components/cronet/url_request_context_config.h" | 10 #include "components/cronet/url_request_context_config.h" |
11 #include "net/base/net_errors.h" | 11 #include "net/base/net_errors.h" |
12 #include "net/base/net_log_logger.h" | 12 #include "net/base/net_log_logger.h" |
| 13 #include "net/base/network_delegate_impl.h" |
13 #include "net/cert/cert_verifier.h" | 14 #include "net/cert/cert_verifier.h" |
14 #include "net/http/http_auth_handler_factory.h" | 15 #include "net/http/http_auth_handler_factory.h" |
15 #include "net/http/http_network_layer.h" | 16 #include "net/http/http_network_layer.h" |
16 #include "net/http/http_server_properties.h" | 17 #include "net/http/http_server_properties.h" |
17 #include "net/proxy/proxy_config_service_fixed.h" | 18 #include "net/proxy/proxy_config_service_fixed.h" |
18 #include "net/proxy/proxy_service.h" | 19 #include "net/proxy/proxy_service.h" |
19 #include "net/ssl/ssl_config_service_defaults.h" | 20 #include "net/ssl/ssl_config_service_defaults.h" |
20 #include "net/url_request/static_http_user_agent_settings.h" | 21 #include "net/url_request/static_http_user_agent_settings.h" |
21 #include "net/url_request/url_request_context.h" | 22 #include "net/url_request/url_request_context.h" |
22 #include "net/url_request/url_request_context_builder.h" | 23 #include "net/url_request/url_request_context_builder.h" |
23 #include "net/url_request/url_request_context_storage.h" | 24 #include "net/url_request/url_request_context_storage.h" |
24 #include "net/url_request/url_request_job_factory_impl.h" | 25 #include "net/url_request/url_request_job_factory_impl.h" |
25 | 26 |
26 namespace { | 27 namespace { |
27 | 28 |
28 class BasicNetworkDelegate : public net::NetworkDelegate { | 29 class BasicNetworkDelegate : public net::NetworkDelegateImpl { |
29 public: | 30 public: |
30 BasicNetworkDelegate() {} | 31 BasicNetworkDelegate() {} |
31 virtual ~BasicNetworkDelegate() {} | 32 virtual ~BasicNetworkDelegate() {} |
32 | 33 |
33 private: | 34 private: |
34 // net::NetworkDelegate implementation. | 35 // net::NetworkDelegate implementation. |
35 int OnBeforeURLRequest(net::URLRequest* request, | 36 int OnBeforeURLRequest(net::URLRequest* request, |
36 const net::CompletionCallback& callback, | 37 const net::CompletionCallback& callback, |
37 GURL* new_url) override { | 38 GURL* new_url) override { |
38 return net::OK; | 39 return net::OK; |
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
248 | 249 |
249 void CronetURLRequestContextAdapter::StopNetLogOnNetworkThread() { | 250 void CronetURLRequestContextAdapter::StopNetLogOnNetworkThread() { |
250 DCHECK(GetNetworkTaskRunner()->BelongsToCurrentThread()); | 251 DCHECK(GetNetworkTaskRunner()->BelongsToCurrentThread()); |
251 if (net_log_logger_) { | 252 if (net_log_logger_) { |
252 net_log_logger_->StopObserving(); | 253 net_log_logger_->StopObserving(); |
253 net_log_logger_.reset(); | 254 net_log_logger_.reset(); |
254 } | 255 } |
255 } | 256 } |
256 | 257 |
257 } // namespace cronet | 258 } // namespace cronet |
OLD | NEW |