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_pool.h" | 5 #include "net/spdy/spdy_session_pool.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/metrics/histogram.h" | 8 #include "base/metrics/histogram.h" |
| 9 #include "base/profiler/scoped_tracker.h" |
9 #include "base/values.h" | 10 #include "base/values.h" |
10 #include "net/base/address_list.h" | 11 #include "net/base/address_list.h" |
11 #include "net/http/http_network_session.h" | 12 #include "net/http/http_network_session.h" |
12 #include "net/http/http_server_properties.h" | 13 #include "net/http/http_server_properties.h" |
13 #include "net/spdy/spdy_session.h" | 14 #include "net/spdy/spdy_session.h" |
14 | 15 |
15 | 16 |
16 namespace net { | 17 namespace net { |
17 | 18 |
18 namespace { | 19 namespace { |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 (default_protocol == kProtoUnknown) ? | 58 (default_protocol == kProtoUnknown) ? |
58 kProtoSPDY31 : default_protocol), | 59 kProtoSPDY31 : default_protocol), |
59 stream_initial_recv_window_size_(stream_initial_recv_window_size), | 60 stream_initial_recv_window_size_(stream_initial_recv_window_size), |
60 initial_max_concurrent_streams_(initial_max_concurrent_streams), | 61 initial_max_concurrent_streams_(initial_max_concurrent_streams), |
61 max_concurrent_streams_limit_(max_concurrent_streams_limit), | 62 max_concurrent_streams_limit_(max_concurrent_streams_limit), |
62 time_func_(time_func), | 63 time_func_(time_func), |
63 trusted_spdy_proxy_( | 64 trusted_spdy_proxy_( |
64 HostPortPair::FromString(trusted_spdy_proxy)) { | 65 HostPortPair::FromString(trusted_spdy_proxy)) { |
65 DCHECK(default_protocol_ >= kProtoSPDYMinimumVersion && | 66 DCHECK(default_protocol_ >= kProtoSPDYMinimumVersion && |
66 default_protocol_ <= kProtoSPDYMaximumVersion); | 67 default_protocol_ <= kProtoSPDYMaximumVersion); |
| 68 // TODO(michaeln): Remove ScopedTracker below once crbug.com/454983 is fixed |
| 69 tracked_objects::ScopedTracker tracking_profile( |
| 70 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
| 71 "454983 SpdySessionPool::SpdySessionPool")); |
67 NetworkChangeNotifier::AddIPAddressObserver(this); | 72 NetworkChangeNotifier::AddIPAddressObserver(this); |
68 if (ssl_config_service_.get()) | 73 if (ssl_config_service_.get()) |
69 ssl_config_service_->AddObserver(this); | 74 ssl_config_service_->AddObserver(this); |
70 CertDatabase::GetInstance()->AddObserver(this); | 75 CertDatabase::GetInstance()->AddObserver(this); |
71 } | 76 } |
72 | 77 |
73 SpdySessionPool::~SpdySessionPool() { | 78 SpdySessionPool::~SpdySessionPool() { |
74 CloseAllSessions(); | 79 CloseAllSessions(); |
75 | 80 |
76 while (!sessions_.empty()) { | 81 while (!sessions_.empty()) { |
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
398 | 403 |
399 if (idle_only && (*it)->is_active()) | 404 if (idle_only && (*it)->is_active()) |
400 continue; | 405 continue; |
401 | 406 |
402 (*it)->CloseSessionOnError(error, description); | 407 (*it)->CloseSessionOnError(error, description); |
403 DCHECK(!IsSessionAvailable(*it)); | 408 DCHECK(!IsSessionAvailable(*it)); |
404 } | 409 } |
405 } | 410 } |
406 | 411 |
407 } // namespace net | 412 } // namespace net |
OLD | NEW |