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

Side by Side Diff: net/socket/ssl_client_socket_pool.cc

Issue 2414883005: TEMP DO NOT LAND (Closed)
Patch Set: temp Created 4 years, 2 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/socket/ssl_client_socket_pool.h" 5 #include "net/socket/ssl_client_socket_pool.h"
6 6
7 #include <openssl/ssl.h> 7 #include <openssl/ssl.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 int SSLClientSocketPool::IdleSocketCountInGroup( 631 int SSLClientSocketPool::IdleSocketCountInGroup(
632 const std::string& group_name) const { 632 const std::string& group_name) const {
633 return base_.IdleSocketCountInGroup(group_name); 633 return base_.IdleSocketCountInGroup(group_name);
634 } 634 }
635 635
636 LoadState SSLClientSocketPool::GetLoadState( 636 LoadState SSLClientSocketPool::GetLoadState(
637 const std::string& group_name, const ClientSocketHandle* handle) const { 637 const std::string& group_name, const ClientSocketHandle* handle) const {
638 return base_.GetLoadState(group_name, handle); 638 return base_.GetLoadState(group_name, handle);
639 } 639 }
640 640
641 void SSLClientSocketPool::PopulateAllocatorDump(
642 base::trace_event::MemoryAllocatorDump* dump) const {
643 base_.PopulateAllocatorDump(dump);
644 }
645
641 std::unique_ptr<base::DictionaryValue> SSLClientSocketPool::GetInfoAsValue( 646 std::unique_ptr<base::DictionaryValue> SSLClientSocketPool::GetInfoAsValue(
642 const std::string& name, 647 const std::string& name,
643 const std::string& type, 648 const std::string& type,
644 bool include_nested_pools) const { 649 bool include_nested_pools) const {
645 std::unique_ptr<base::DictionaryValue> dict(base_.GetInfoAsValue(name, type)); 650 std::unique_ptr<base::DictionaryValue> dict(base_.GetInfoAsValue(name, type));
646 if (include_nested_pools) { 651 if (include_nested_pools) {
647 base::ListValue* list = new base::ListValue(); 652 base::ListValue* list = new base::ListValue();
648 if (transport_pool_) { 653 if (transport_pool_) {
649 list->Append(transport_pool_->GetInfoAsValue("transport_socket_pool", 654 list->Append(transport_pool_->GetInfoAsValue("transport_socket_pool",
650 "transport_socket_pool", 655 "transport_socket_pool",
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
686 if (base_.CloseOneIdleSocket()) 691 if (base_.CloseOneIdleSocket())
687 return true; 692 return true;
688 return base_.CloseOneIdleConnectionInHigherLayeredPool(); 693 return base_.CloseOneIdleConnectionInHigherLayeredPool();
689 } 694 }
690 695
691 void SSLClientSocketPool::OnSSLConfigChanged() { 696 void SSLClientSocketPool::OnSSLConfigChanged() {
692 FlushWithError(ERR_NETWORK_CHANGED); 697 FlushWithError(ERR_NETWORK_CHANGED);
693 } 698 }
694 699
695 } // namespace net 700 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698