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

Side by Side Diff: net/spdy/spdy_session_pool.cc

Issue 706203003: Update from https://crrev.com/303153 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « net/spdy/spdy_framer_test.cc ('k') | net/test/cert_test_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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/values.h" 9 #include "base/values.h"
10 #include "net/base/address_list.h" 10 #include "net/base/address_list.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 verify_domain_authentication_(true), 48 verify_domain_authentication_(true),
49 enable_sending_initial_data_(true), 49 enable_sending_initial_data_(true),
50 force_single_domain_(force_single_domain), 50 force_single_domain_(force_single_domain),
51 enable_compression_(enable_compression), 51 enable_compression_(enable_compression),
52 enable_ping_based_connection_checking_( 52 enable_ping_based_connection_checking_(
53 enable_ping_based_connection_checking), 53 enable_ping_based_connection_checking),
54 // TODO(akalin): Force callers to have a valid value of 54 // TODO(akalin): Force callers to have a valid value of
55 // |default_protocol_|. 55 // |default_protocol_|.
56 default_protocol_( 56 default_protocol_(
57 (default_protocol == kProtoUnknown) ? 57 (default_protocol == kProtoUnknown) ?
58 kProtoSPDY3 : default_protocol), 58 kProtoSPDY31 : default_protocol),
59 stream_initial_recv_window_size_(stream_initial_recv_window_size), 59 stream_initial_recv_window_size_(stream_initial_recv_window_size),
60 initial_max_concurrent_streams_(initial_max_concurrent_streams), 60 initial_max_concurrent_streams_(initial_max_concurrent_streams),
61 max_concurrent_streams_limit_(max_concurrent_streams_limit), 61 max_concurrent_streams_limit_(max_concurrent_streams_limit),
62 time_func_(time_func), 62 time_func_(time_func),
63 trusted_spdy_proxy_( 63 trusted_spdy_proxy_(
64 HostPortPair::FromString(trusted_spdy_proxy)) { 64 HostPortPair::FromString(trusted_spdy_proxy)) {
65 DCHECK(default_protocol_ >= kProtoSPDYMinimumVersion && 65 DCHECK(default_protocol_ >= kProtoSPDYMinimumVersion &&
66 default_protocol_ <= kProtoSPDYMaximumVersion); 66 default_protocol_ <= kProtoSPDYMaximumVersion);
67 NetworkChangeNotifier::AddIPAddressObserver(this); 67 NetworkChangeNotifier::AddIPAddressObserver(this);
68 if (ssl_config_service_.get()) 68 if (ssl_config_service_.get())
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 398
399 if (idle_only && (*it)->is_active()) 399 if (idle_only && (*it)->is_active())
400 continue; 400 continue;
401 401
402 (*it)->CloseSessionOnError(error, description); 402 (*it)->CloseSessionOnError(error, description);
403 DCHECK(!IsSessionAvailable(*it)); 403 DCHECK(!IsSessionAvailable(*it));
404 } 404 }
405 } 405 }
406 406
407 } // namespace net 407 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_framer_test.cc ('k') | net/test/cert_test_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698