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/spdy/spdy_session.h" | 5 #include "net/spdy/spdy_session.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <map> | 8 #include <map> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
(...skipping 725 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
736 | 736 |
737 buffered_spdy_framer_.reset( | 737 buffered_spdy_framer_.reset( |
738 new BufferedSpdyFramer(NextProtoToSpdyMajorVersion(protocol_), | 738 new BufferedSpdyFramer(NextProtoToSpdyMajorVersion(protocol_), |
739 enable_compression_)); | 739 enable_compression_)); |
740 buffered_spdy_framer_->set_visitor(this); | 740 buffered_spdy_framer_->set_visitor(this); |
741 buffered_spdy_framer_->set_debug_visitor(this); | 741 buffered_spdy_framer_->set_debug_visitor(this); |
742 UMA_HISTOGRAM_ENUMERATION( | 742 UMA_HISTOGRAM_ENUMERATION( |
743 "Net.SpdyVersion2", | 743 "Net.SpdyVersion2", |
744 protocol_ - kProtoSPDYMinimumVersion, | 744 protocol_ - kProtoSPDYMinimumVersion, |
745 kProtoSPDYMaximumVersion - kProtoSPDYMinimumVersion + 1); | 745 kProtoSPDYMaximumVersion - kProtoSPDYMinimumVersion + 1); |
746 #if defined(SPDY_PROXY_AUTH_ORIGIN) | |
747 UMA_HISTOGRAM_BOOLEAN("Net.SpdySessions_DataReductionProxy", | |
748 host_port_pair().Equals(HostPortPair::FromURL( | |
749 GURL(SPDY_PROXY_AUTH_ORIGIN)))); | |
750 #endif | |
751 | 746 |
752 net_log_.AddEvent(NetLog::TYPE_SPDY_SESSION_INITIALIZED, | 747 net_log_.AddEvent(NetLog::TYPE_SPDY_SESSION_INITIALIZED, |
753 base::Bind(&NetLogSpdyInitializedCallback, | 748 base::Bind(&NetLogSpdyInitializedCallback, |
754 connection_->socket()->NetLog().source(), | 749 connection_->socket()->NetLog().source(), |
755 protocol_)); | 750 protocol_)); |
756 | 751 |
757 DCHECK_EQ(availability_state_, STATE_AVAILABLE); | 752 DCHECK_EQ(availability_state_, STATE_AVAILABLE); |
758 connection_->AddHigherLayeredPool(this); | 753 connection_->AddHigherLayeredPool(this); |
759 if (enable_sending_initial_data_) | 754 if (enable_sending_initial_data_) |
760 SendInitialData(); | 755 SendInitialData(); |
(...skipping 2497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3258 if (!queue->empty()) { | 3253 if (!queue->empty()) { |
3259 SpdyStreamId stream_id = queue->front(); | 3254 SpdyStreamId stream_id = queue->front(); |
3260 queue->pop_front(); | 3255 queue->pop_front(); |
3261 return stream_id; | 3256 return stream_id; |
3262 } | 3257 } |
3263 } | 3258 } |
3264 return 0; | 3259 return 0; |
3265 } | 3260 } |
3266 | 3261 |
3267 } // namespace net | 3262 } // namespace net |
OLD | NEW |