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 <limits> | 7 #include <limits> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
11 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
12 #include "base/single_thread_task_runner.h" | 12 #include "base/single_thread_task_runner.h" |
13 #include "components/cronet/url_request_context_config.h" | 13 #include "components/cronet/url_request_context_config.h" |
14 #include "net/android/network_change_notifier_factory_android.h" | 14 #include "net/android/network_change_notifier_factory_android.h" |
15 #include "net/base/net_errors.h" | 15 #include "net/base/net_errors.h" |
16 #include "net/base/net_log_logger.h" | 16 #include "net/base/net_log_logger.h" |
17 #include "net/base/net_util.h" | 17 #include "net/base/net_util.h" |
18 #include "net/base/network_change_notifier.h" | 18 #include "net/base/network_change_notifier.h" |
| 19 #include "net/base/network_delegate_impl.h" |
19 #include "net/cert/cert_verifier.h" | 20 #include "net/cert/cert_verifier.h" |
20 #include "net/http/http_auth_handler_factory.h" | 21 #include "net/http/http_auth_handler_factory.h" |
21 #include "net/http/http_network_layer.h" | 22 #include "net/http/http_network_layer.h" |
22 #include "net/http/http_server_properties.h" | 23 #include "net/http/http_server_properties.h" |
23 #include "net/proxy/proxy_service.h" | 24 #include "net/proxy/proxy_service.h" |
24 #include "net/ssl/ssl_config_service_defaults.h" | 25 #include "net/ssl/ssl_config_service_defaults.h" |
25 #include "net/url_request/static_http_user_agent_settings.h" | 26 #include "net/url_request/static_http_user_agent_settings.h" |
26 #include "net/url_request/url_request_context_builder.h" | 27 #include "net/url_request/url_request_context_builder.h" |
27 #include "net/url_request/url_request_context_storage.h" | 28 #include "net/url_request/url_request_context_storage.h" |
28 #include "net/url_request/url_request_job_factory_impl.h" | 29 #include "net/url_request/url_request_job_factory_impl.h" |
29 | 30 |
30 namespace { | 31 namespace { |
31 | 32 |
32 // MessageLoop on the main thread, which is where objects that receive Java | 33 // MessageLoop on the main thread, which is where objects that receive Java |
33 // notifications generally live. | 34 // notifications generally live. |
34 base::MessageLoop* g_main_message_loop = nullptr; | 35 base::MessageLoop* g_main_message_loop = nullptr; |
35 | 36 |
36 net::NetworkChangeNotifier* g_network_change_notifier = nullptr; | 37 net::NetworkChangeNotifier* g_network_change_notifier = nullptr; |
37 | 38 |
38 class BasicNetworkDelegate : public net::NetworkDelegate { | 39 class BasicNetworkDelegate : public net::NetworkDelegateImpl { |
39 public: | 40 public: |
40 BasicNetworkDelegate() {} | 41 BasicNetworkDelegate() {} |
41 virtual ~BasicNetworkDelegate() {} | 42 virtual ~BasicNetworkDelegate() {} |
42 | 43 |
43 private: | 44 private: |
44 // net::NetworkDelegate implementation. | 45 // net::NetworkDelegate implementation. |
45 int OnBeforeURLRequest(net::URLRequest* request, | 46 int OnBeforeURLRequest(net::URLRequest* request, |
46 const net::CompletionCallback& callback, | 47 const net::CompletionCallback& callback, |
47 GURL* new_url) override { | 48 GURL* new_url) override { |
48 return net::OK; | 49 return net::OK; |
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
309 net_log_logger_.reset(); | 310 net_log_logger_.reset(); |
310 } | 311 } |
311 } | 312 } |
312 | 313 |
313 void NetLogObserver::OnAddEntry(const net::NetLog::Entry& entry) { | 314 void NetLogObserver::OnAddEntry(const net::NetLog::Entry& entry) { |
314 VLOG(2) << "Net log entry: type=" << entry.type() | 315 VLOG(2) << "Net log entry: type=" << entry.type() |
315 << ", source=" << entry.source().type << ", phase=" << entry.phase(); | 316 << ", source=" << entry.source().type << ", phase=" << entry.phase(); |
316 } | 317 } |
317 | 318 |
318 } // namespace cronet | 319 } // namespace cronet |
OLD | NEW |