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

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

Issue 1059843002: Refactor NetLog::LogLevel --> NetLogCaptureMode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again to fix a merge conflict Created 5 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 <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"
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 static_cast<uint16>(quic_hint.alternate_port)); 192 static_cast<uint16>(quic_hint.alternate_port));
193 context_->http_server_properties()->SetAlternativeService( 193 context_->http_server_properties()->SetAlternativeService(
194 quic_hint_host_port_pair, alternative_service, 1.0f); 194 quic_hint_host_port_pair, alternative_service, 1.0f);
195 } 195 }
196 } 196 }
197 load_disable_cache_ = config_->load_disable_cache; 197 load_disable_cache_ = config_->load_disable_cache;
198 config_.reset(NULL); 198 config_.reset(NULL);
199 199
200 if (VLOG_IS_ON(2)) { 200 if (VLOG_IS_ON(2)) {
201 net_log_observer_.reset(new NetLogObserver()); 201 net_log_observer_.reset(new NetLogObserver());
202 context_->net_log()->DeprecatedAddObserver(net_log_observer_.get(), 202 context_->net_log()->DeprecatedAddObserver(
203 net::NetLog::LOG_ALL_BUT_BYTES); 203 net_log_observer_.get(),
204 net::NetLogCaptureMode::IncludeCookiesAndCredentials());
204 } 205 }
205 206
206 is_context_initialized_ = true; 207 is_context_initialized_ = true;
207 while (!tasks_waiting_for_context_.empty()) { 208 while (!tasks_waiting_for_context_.empty()) {
208 tasks_waiting_for_context_.front().Run(); 209 tasks_waiting_for_context_.front().Run();
209 tasks_waiting_for_context_.pop(); 210 tasks_waiting_for_context_.pop();
210 } 211 }
211 212
212 delegate_->OnContextInitialized(this); 213 delegate_->OnContextInitialized(this);
213 } 214 }
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 net_log_logger_.reset(); 298 net_log_logger_.reset();
298 } 299 }
299 } 300 }
300 301
301 void NetLogObserver::OnAddEntry(const net::NetLog::Entry& entry) { 302 void NetLogObserver::OnAddEntry(const net::NetLog::Entry& entry) {
302 VLOG(2) << "Net log entry: type=" << entry.type() 303 VLOG(2) << "Net log entry: type=" << entry.type()
303 << ", source=" << entry.source().type << ", phase=" << entry.phase(); 304 << ", source=" << entry.source().type << ", phase=" << entry.phase();
304 } 305 }
305 306
306 } // namespace cronet 307 } // namespace cronet
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698