| Index: components/cronet/android/url_request_context_adapter.cc
|
| diff --git a/components/cronet/android/url_request_context_adapter.cc b/components/cronet/android/url_request_context_adapter.cc
|
| index 73c77b1b90f599763bc181300834fef20e318fe3..a175c7e97c9241336b7059a1c452ad4dcc0edf0c 100644
|
| --- a/components/cronet/android/url_request_context_adapter.cc
|
| +++ b/components/cronet/android/url_request_context_adapter.cc
|
| @@ -13,6 +13,7 @@
|
| #include "base/bind.h"
|
| #include "base/files/file_util.h"
|
| #include "base/files/scoped_file.h"
|
| +#include "base/lazy_instance.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "base/message_loop/message_loop.h"
|
| @@ -40,6 +41,10 @@
|
|
|
| namespace {
|
|
|
| +// Use a global NetLog instance. See crbug.com/486120.
|
| +static base::LazyInstance<net::NetLog>::Leaky g_net_log =
|
| + LAZY_INSTANCE_INITIALIZER;
|
| +
|
| class BasicNetworkDelegate : public net::NetworkDelegateImpl {
|
| public:
|
| BasicNetworkDelegate() {}
|
| @@ -150,8 +155,8 @@ void URLRequestContextAdapter::InitRequestContextOnNetworkThread() {
|
| context_builder.set_network_delegate(
|
| base::WrapUnique(new BasicNetworkDelegate()));
|
| context_builder.set_proxy_config_service(std::move(proxy_config_service_));
|
| - config_->ConfigureURLRequestContextBuilder(&context_builder, nullptr,
|
| - nullptr);
|
| + config_->ConfigureURLRequestContextBuilder(&context_builder,
|
| + g_net_log.Pointer(), nullptr);
|
|
|
| context_ = context_builder.Build();
|
|
|
|
|