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

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

Issue 657013003: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « net/socket/client_socket_pool_base.h ('k') | net/socket/ssl_client_socket_pool.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/socket/socket_test_util.h" 5 #include "net/socket/socket_test_util.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 665 matching lines...) Expand 10 before | Expand all | Expand 10 after
676 DatagramSocket::BindType bind_type, 676 DatagramSocket::BindType bind_type,
677 const RandIntCallback& rand_int_cb, 677 const RandIntCallback& rand_int_cb,
678 net::NetLog* net_log, 678 net::NetLog* net_log,
679 const net::NetLog::Source& source) { 679 const net::NetLog::Source& source) {
680 SocketDataProvider* data_provider = mock_data_.GetNext(); 680 SocketDataProvider* data_provider = mock_data_.GetNext();
681 scoped_ptr<MockUDPClientSocket> socket( 681 scoped_ptr<MockUDPClientSocket> socket(
682 new MockUDPClientSocket(data_provider, net_log)); 682 new MockUDPClientSocket(data_provider, net_log));
683 data_provider->set_socket(socket.get()); 683 data_provider->set_socket(socket.get());
684 if (bind_type == DatagramSocket::RANDOM_BIND) 684 if (bind_type == DatagramSocket::RANDOM_BIND)
685 socket->set_source_port(rand_int_cb.Run(1025, 65535)); 685 socket->set_source_port(rand_int_cb.Run(1025, 65535));
686 return socket.PassAs<DatagramClientSocket>(); 686 return socket.Pass();
687 } 687 }
688 688
689 scoped_ptr<StreamSocket> MockClientSocketFactory::CreateTransportClientSocket( 689 scoped_ptr<StreamSocket> MockClientSocketFactory::CreateTransportClientSocket(
690 const AddressList& addresses, 690 const AddressList& addresses,
691 net::NetLog* net_log, 691 net::NetLog* net_log,
692 const net::NetLog::Source& source) { 692 const net::NetLog::Source& source) {
693 SocketDataProvider* data_provider = mock_data_.GetNext(); 693 SocketDataProvider* data_provider = mock_data_.GetNext();
694 scoped_ptr<MockTCPClientSocket> socket( 694 scoped_ptr<MockTCPClientSocket> socket(
695 new MockTCPClientSocket(addresses, net_log, data_provider)); 695 new MockTCPClientSocket(addresses, net_log, data_provider));
696 data_provider->set_socket(socket.get()); 696 data_provider->set_socket(socket.get());
697 return socket.PassAs<StreamSocket>(); 697 return socket.Pass();
698 } 698 }
699 699
700 scoped_ptr<SSLClientSocket> MockClientSocketFactory::CreateSSLClientSocket( 700 scoped_ptr<SSLClientSocket> MockClientSocketFactory::CreateSSLClientSocket(
701 scoped_ptr<ClientSocketHandle> transport_socket, 701 scoped_ptr<ClientSocketHandle> transport_socket,
702 const HostPortPair& host_and_port, 702 const HostPortPair& host_and_port,
703 const SSLConfig& ssl_config, 703 const SSLConfig& ssl_config,
704 const SSLClientSocketContext& context) { 704 const SSLClientSocketContext& context) {
705 scoped_ptr<MockSSLClientSocket> socket( 705 scoped_ptr<MockSSLClientSocket> socket(
706 new MockSSLClientSocket(transport_socket.Pass(), 706 new MockSSLClientSocket(transport_socket.Pass(),
707 host_and_port, 707 host_and_port,
708 ssl_config, 708 ssl_config,
709 mock_ssl_data_.GetNext())); 709 mock_ssl_data_.GetNext()));
710 ssl_client_sockets_.push_back(socket.get()); 710 ssl_client_sockets_.push_back(socket.get());
711 return socket.PassAs<SSLClientSocket>(); 711 return socket.Pass();
712 } 712 }
713 713
714 void MockClientSocketFactory::ClearSSLSessionCache() { 714 void MockClientSocketFactory::ClearSSLSessionCache() {
715 } 715 }
716 716
717 const char MockClientSocket::kTlsUnique[] = "MOCK_TLSUNIQ"; 717 const char MockClientSocket::kTlsUnique[] = "MOCK_TLSUNIQ";
718 718
719 MockClientSocket::MockClientSocket(const BoundNetLog& net_log) 719 MockClientSocket::MockClientSocket(const BoundNetLog& net_log)
720 : connected_(false), 720 : connected_(false),
721 net_log_(net_log), 721 net_log_(net_log),
(...skipping 1189 matching lines...) Expand 10 before | Expand all | Expand 10 after
1911 const RandIntCallback& rand_int_cb, 1911 const RandIntCallback& rand_int_cb,
1912 net::NetLog* net_log, 1912 net::NetLog* net_log,
1913 const NetLog::Source& source) { 1913 const NetLog::Source& source) {
1914 DeterministicSocketData* data_provider = mock_data().GetNext(); 1914 DeterministicSocketData* data_provider = mock_data().GetNext();
1915 scoped_ptr<DeterministicMockUDPClientSocket> socket( 1915 scoped_ptr<DeterministicMockUDPClientSocket> socket(
1916 new DeterministicMockUDPClientSocket(net_log, data_provider)); 1916 new DeterministicMockUDPClientSocket(net_log, data_provider));
1917 data_provider->set_delegate(socket->AsWeakPtr()); 1917 data_provider->set_delegate(socket->AsWeakPtr());
1918 udp_client_sockets().push_back(socket.get()); 1918 udp_client_sockets().push_back(socket.get());
1919 if (bind_type == DatagramSocket::RANDOM_BIND) 1919 if (bind_type == DatagramSocket::RANDOM_BIND)
1920 socket->set_source_port(rand_int_cb.Run(1025, 65535)); 1920 socket->set_source_port(rand_int_cb.Run(1025, 65535));
1921 return socket.PassAs<DatagramClientSocket>(); 1921 return socket.Pass();
1922 } 1922 }
1923 1923
1924 scoped_ptr<StreamSocket> 1924 scoped_ptr<StreamSocket>
1925 DeterministicMockClientSocketFactory::CreateTransportClientSocket( 1925 DeterministicMockClientSocketFactory::CreateTransportClientSocket(
1926 const AddressList& addresses, 1926 const AddressList& addresses,
1927 net::NetLog* net_log, 1927 net::NetLog* net_log,
1928 const net::NetLog::Source& source) { 1928 const net::NetLog::Source& source) {
1929 DeterministicSocketData* data_provider = mock_data().GetNext(); 1929 DeterministicSocketData* data_provider = mock_data().GetNext();
1930 scoped_ptr<DeterministicMockTCPClientSocket> socket( 1930 scoped_ptr<DeterministicMockTCPClientSocket> socket(
1931 new DeterministicMockTCPClientSocket(net_log, data_provider)); 1931 new DeterministicMockTCPClientSocket(net_log, data_provider));
1932 data_provider->set_delegate(socket->AsWeakPtr()); 1932 data_provider->set_delegate(socket->AsWeakPtr());
1933 tcp_client_sockets().push_back(socket.get()); 1933 tcp_client_sockets().push_back(socket.get());
1934 return socket.PassAs<StreamSocket>(); 1934 return socket.Pass();
1935 } 1935 }
1936 1936
1937 scoped_ptr<SSLClientSocket> 1937 scoped_ptr<SSLClientSocket>
1938 DeterministicMockClientSocketFactory::CreateSSLClientSocket( 1938 DeterministicMockClientSocketFactory::CreateSSLClientSocket(
1939 scoped_ptr<ClientSocketHandle> transport_socket, 1939 scoped_ptr<ClientSocketHandle> transport_socket,
1940 const HostPortPair& host_and_port, 1940 const HostPortPair& host_and_port,
1941 const SSLConfig& ssl_config, 1941 const SSLConfig& ssl_config,
1942 const SSLClientSocketContext& context) { 1942 const SSLClientSocketContext& context) {
1943 scoped_ptr<MockSSLClientSocket> socket( 1943 scoped_ptr<MockSSLClientSocket> socket(
1944 new MockSSLClientSocket(transport_socket.Pass(), 1944 new MockSSLClientSocket(transport_socket.Pass(),
1945 host_and_port, ssl_config, 1945 host_and_port, ssl_config,
1946 mock_ssl_data_.GetNext())); 1946 mock_ssl_data_.GetNext()));
1947 ssl_client_sockets_.push_back(socket.get()); 1947 ssl_client_sockets_.push_back(socket.get());
1948 return socket.PassAs<SSLClientSocket>(); 1948 return socket.Pass();
1949 } 1949 }
1950 1950
1951 void DeterministicMockClientSocketFactory::ClearSSLSessionCache() { 1951 void DeterministicMockClientSocketFactory::ClearSSLSessionCache() {
1952 } 1952 }
1953 1953
1954 MockSOCKSClientSocketPool::MockSOCKSClientSocketPool( 1954 MockSOCKSClientSocketPool::MockSOCKSClientSocketPool(
1955 int max_sockets, 1955 int max_sockets,
1956 int max_sockets_per_group, 1956 int max_sockets_per_group,
1957 ClientSocketPoolHistograms* histograms, 1957 ClientSocketPoolHistograms* histograms,
1958 TransportClientSocketPool* transport_pool) 1958 TransportClientSocketPool* transport_pool)
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
1991 1991
1992 const char kSOCKS5OkRequest[] = 1992 const char kSOCKS5OkRequest[] =
1993 { 0x05, 0x01, 0x00, 0x03, 0x04, 'h', 'o', 's', 't', 0x00, 0x50 }; 1993 { 0x05, 0x01, 0x00, 0x03, 0x04, 'h', 'o', 's', 't', 0x00, 0x50 };
1994 const int kSOCKS5OkRequestLength = arraysize(kSOCKS5OkRequest); 1994 const int kSOCKS5OkRequestLength = arraysize(kSOCKS5OkRequest);
1995 1995
1996 const char kSOCKS5OkResponse[] = 1996 const char kSOCKS5OkResponse[] =
1997 { 0x05, 0x00, 0x00, 0x01, 127, 0, 0, 1, 0x00, 0x50 }; 1997 { 0x05, 0x00, 0x00, 0x01, 127, 0, 0, 1, 0x00, 0x50 };
1998 const int kSOCKS5OkResponseLength = arraysize(kSOCKS5OkResponse); 1998 const int kSOCKS5OkResponseLength = arraysize(kSOCKS5OkResponse);
1999 1999
2000 } // namespace net 2000 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/client_socket_pool_base.h ('k') | net/socket/ssl_client_socket_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698