Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(783)

Side by Side Diff: components/cronet/android/url_request_context_adapter.cc

Issue 1833203002: Plumb SSLKEYLOGFILE from Cronet to net (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comment Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #include <limits> 9 #include <limits>
10 #include <utility> 10 #include <utility>
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 // TODO(mef): Remove this work around for crbug.com/543366 once it is fixed. 147 // TODO(mef): Remove this work around for crbug.com/543366 once it is fixed.
148 net::URLRequestContextBuilder::HttpNetworkSessionParams 148 net::URLRequestContextBuilder::HttpNetworkSessionParams
149 custom_http_network_session_params; 149 custom_http_network_session_params;
150 custom_http_network_session_params.parse_alternative_services = false; 150 custom_http_network_session_params.parse_alternative_services = false;
151 context_builder.set_http_network_session_params( 151 context_builder.set_http_network_session_params(
152 custom_http_network_session_params); 152 custom_http_network_session_params);
153 153
154 context_builder.set_network_delegate( 154 context_builder.set_network_delegate(
155 make_scoped_ptr(new BasicNetworkDelegate())); 155 make_scoped_ptr(new BasicNetworkDelegate()));
156 context_builder.set_proxy_config_service(std::move(proxy_config_service_)); 156 context_builder.set_proxy_config_service(std::move(proxy_config_service_));
157 config_->ConfigureURLRequestContextBuilder(&context_builder, nullptr); 157 config_->ConfigureURLRequestContextBuilder(&context_builder, nullptr,
158 nullptr);
158 159
159 context_ = context_builder.Build(); 160 context_ = context_builder.Build();
160 161
161 if (config_->enable_sdch) { 162 if (config_->enable_sdch) {
162 DCHECK(context_->sdch_manager()); 163 DCHECK(context_->sdch_manager());
163 sdch_owner_.reset( 164 sdch_owner_.reset(
164 new net::SdchOwner(context_->sdch_manager(), context_.get())); 165 new net::SdchOwner(context_->sdch_manager(), context_.get()));
165 } 166 }
166 167
167 if (config_->enable_quic) { 168 if (config_->enable_quic) {
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 write_to_file_observer_.reset(); 314 write_to_file_observer_.reset();
314 } 315 }
315 } 316 }
316 317
317 void NetLogObserver::OnAddEntry(const net::NetLog::Entry& entry) { 318 void NetLogObserver::OnAddEntry(const net::NetLog::Entry& entry) {
318 VLOG(2) << "Net log entry: type=" << entry.type() 319 VLOG(2) << "Net log entry: type=" << entry.type()
319 << ", source=" << entry.source().type << ", phase=" << entry.phase(); 320 << ", source=" << entry.source().type << ", phase=" << entry.phase();
320 } 321 }
321 322
322 } // namespace cronet 323 } // namespace cronet
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698