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

Side by Side Diff: net/quic/quic_client_session.cc

Issue 863253002: Update from https://crrev.com/312600 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 11 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "net/quic/quic_client_session.h" 5 #include "net/quic/quic_client_session.h"
6 6
7 #include "base/callback_helpers.h" 7 #include "base/callback_helpers.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/metrics/sparse_histogram.h" 10 #include "base/metrics/sparse_histogram.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 } 97 }
98 98
99 base::Value* NetLogQuicClientSessionCallback( 99 base::Value* NetLogQuicClientSessionCallback(
100 const QuicServerId* server_id, 100 const QuicServerId* server_id,
101 bool require_confirmation, 101 bool require_confirmation,
102 NetLog::LogLevel /* log_level */) { 102 NetLog::LogLevel /* log_level */) {
103 base::DictionaryValue* dict = new base::DictionaryValue(); 103 base::DictionaryValue* dict = new base::DictionaryValue();
104 dict->SetString("host", server_id->host()); 104 dict->SetString("host", server_id->host());
105 dict->SetInteger("port", server_id->port()); 105 dict->SetInteger("port", server_id->port());
106 dict->SetBoolean("is_https", server_id->is_https()); 106 dict->SetBoolean("is_https", server_id->is_https());
107 dict->SetBoolean("privacy_mode",
108 server_id->privacy_mode() == PRIVACY_MODE_ENABLED);
107 dict->SetBoolean("require_confirmation", require_confirmation); 109 dict->SetBoolean("require_confirmation", require_confirmation);
108 return dict; 110 return dict;
109 } 111 }
110 112
111 } // namespace 113 } // namespace
112 114
113 QuicClientSession::StreamRequest::StreamRequest() : stream_(nullptr) {} 115 QuicClientSession::StreamRequest::StreamRequest() : stream_(nullptr) {}
114 116
115 QuicClientSession::StreamRequest::~StreamRequest() { 117 QuicClientSession::StreamRequest::~StreamRequest() {
116 CancelRequest(); 118 CancelRequest();
(...skipping 812 matching lines...) Expand 10 before | Expand all | Expand 10 after
929 return; 931 return;
930 932
931 // TODO(rch): re-enable this code once beta is cut. 933 // TODO(rch): re-enable this code once beta is cut.
932 // if (stream_factory_) 934 // if (stream_factory_)
933 // stream_factory_->OnSessionConnectTimeout(this); 935 // stream_factory_->OnSessionConnectTimeout(this);
934 // CloseAllStreams(ERR_QUIC_HANDSHAKE_FAILED); 936 // CloseAllStreams(ERR_QUIC_HANDSHAKE_FAILED);
935 // DCHECK_EQ(0u, GetNumOpenStreams()); 937 // DCHECK_EQ(0u, GetNumOpenStreams());
936 } 938 }
937 939
938 } // namespace net 940 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698