| OLD | NEW |
| 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_chromium_client_session.h" | 5 #include "net/quic/quic_chromium_client_session.h" |
| 6 | 6 |
| 7 #include "base/callback_helpers.h" | 7 #include "base/callback_helpers.h" |
| 8 #include "base/location.h" | 8 #include "base/location.h" |
| 9 #include "base/metrics/histogram_macros.h" | 9 #include "base/metrics/histogram_macros.h" |
| 10 #include "base/metrics/sparse_histogram.h" | 10 #include "base/metrics/sparse_histogram.h" |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 } | 99 } |
| 100 | 100 |
| 101 scoped_ptr<base::Value> NetLogQuicClientSessionCallback( | 101 scoped_ptr<base::Value> NetLogQuicClientSessionCallback( |
| 102 const QuicServerId* server_id, | 102 const QuicServerId* server_id, |
| 103 int cert_verify_flags, | 103 int cert_verify_flags, |
| 104 bool require_confirmation, | 104 bool require_confirmation, |
| 105 NetLogCaptureMode /* capture_mode */) { | 105 NetLogCaptureMode /* capture_mode */) { |
| 106 scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); | 106 scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); |
| 107 dict->SetString("host", server_id->host()); | 107 dict->SetString("host", server_id->host()); |
| 108 dict->SetInteger("port", server_id->port()); | 108 dict->SetInteger("port", server_id->port()); |
| 109 dict->SetBoolean("is_https", server_id->is_https()); | |
| 110 dict->SetBoolean("privacy_mode", | 109 dict->SetBoolean("privacy_mode", |
| 111 server_id->privacy_mode() == PRIVACY_MODE_ENABLED); | 110 server_id->privacy_mode() == PRIVACY_MODE_ENABLED); |
| 112 dict->SetBoolean("require_confirmation", require_confirmation); | 111 dict->SetBoolean("require_confirmation", require_confirmation); |
| 113 dict->SetInteger("cert_verify_flags", cert_verify_flags); | 112 dict->SetInteger("cert_verify_flags", cert_verify_flags); |
| 114 return dict.Pass(); | 113 return dict.Pass(); |
| 115 } | 114 } |
| 116 | 115 |
| 117 } // namespace | 116 } // namespace |
| 118 | 117 |
| 119 QuicChromiumClientSession::StreamRequest::StreamRequest() : stream_(nullptr) {} | 118 QuicChromiumClientSession::StreamRequest::StreamRequest() : stream_(nullptr) {} |
| (...skipping 844 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 964 return; | 963 return; |
| 965 | 964 |
| 966 // TODO(rch): re-enable this code once beta is cut. | 965 // TODO(rch): re-enable this code once beta is cut. |
| 967 // if (stream_factory_) | 966 // if (stream_factory_) |
| 968 // stream_factory_->OnSessionConnectTimeout(this); | 967 // stream_factory_->OnSessionConnectTimeout(this); |
| 969 // CloseAllStreams(ERR_QUIC_HANDSHAKE_FAILED); | 968 // CloseAllStreams(ERR_QUIC_HANDSHAKE_FAILED); |
| 970 // DCHECK_EQ(0u, GetNumOpenStreams()); | 969 // DCHECK_EQ(0u, GetNumOpenStreams()); |
| 971 } | 970 } |
| 972 | 971 |
| 973 } // namespace net | 972 } // namespace net |
| OLD | NEW |