diff options
Diffstat (limited to 'chromium/jingle/glue/fake_ssl_client_socket_unittest.cc')
| -rw-r--r-- | chromium/jingle/glue/fake_ssl_client_socket_unittest.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chromium/jingle/glue/fake_ssl_client_socket_unittest.cc b/chromium/jingle/glue/fake_ssl_client_socket_unittest.cc index f6d8fea5fb3..5c061f3774c 100644 --- a/chromium/jingle/glue/fake_ssl_client_socket_unittest.cc +++ b/chromium/jingle/glue/fake_ssl_client_socket_unittest.cc @@ -91,7 +91,7 @@ class FakeSSLClientSocketTest : public testing::Test { virtual ~FakeSSLClientSocketTest() {} - scoped_ptr<net::StreamSocket> MakeClientSocket() { + net::StreamSocket* MakeClientSocket() { return mock_client_socket_factory_.CreateTransportClientSocket( net::AddressList(), NULL, net::NetLog::Source()); } @@ -269,7 +269,7 @@ class FakeSSLClientSocketTest : public testing::Test { }; TEST_F(FakeSSLClientSocketTest, PassThroughMethods) { - scoped_ptr<MockClientSocket> mock_client_socket(new MockClientSocket()); + MockClientSocket* mock_client_socket = new MockClientSocket(); const int kReceiveBufferSize = 10; const int kSendBufferSize = 20; net::IPEndPoint ip_endpoint(net::IPAddressNumber(net::kIPv4AddressSize), 80); @@ -284,8 +284,7 @@ TEST_F(FakeSSLClientSocketTest, PassThroughMethods) { EXPECT_CALL(*mock_client_socket, SetOmniboxSpeculation()); // Takes ownership of |mock_client_socket|. - FakeSSLClientSocket fake_ssl_client_socket( - mock_client_socket.PassAs<net::StreamSocket>()); + FakeSSLClientSocket fake_ssl_client_socket(mock_client_socket); fake_ssl_client_socket.SetReceiveBufferSize(kReceiveBufferSize); fake_ssl_client_socket.SetSendBufferSize(kSendBufferSize); EXPECT_EQ(kPeerAddress, |