diff options
| author | David Benjamin <davidben@chromium.org> | 2014-10-27 13:49:42 -0400 |
|---|---|---|
| committer | David Benjamin <davidben@chromium.org> | 2014-10-27 17:50:30 +0000 |
| commit | 0d5b470ed36f0778c394d4622e42b9e7b64da76a (patch) | |
| tree | f7d6680b44dae5f5c5ced3412876d2f0f1bb801d | |
| parent | 723c9e204a10e13f3429dcaf37ef73479bffe162 (diff) | |
| download | chromium_src-0d5b470ed36f0778c394d4622e42b9e7b64da76a.zip chromium_src-0d5b470ed36f0778c394d4622e42b9e7b64da76a.tar.gz chromium_src-0d5b470ed36f0778c394d4622e42b9e7b64da76a.tar.bz2 | |
Fix 2125 build to account for PassAs -> Pass transition
Branch 2125 doesn't have the more general version of Pass.
BUG=none
TBR=rsleevi@chromium.org
Review URL: https://codereview.chromium.org/682643003
Cr-Commit-Position: refs/branch-heads/2125_102@{#5}
Cr-Branched-From: c3dfa2453c0a3252b6b745bbc1d668ae2c5529ca-refs/branch-heads/2125@{#553}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
| -rw-r--r-- | net/socket/ssl_client_socket_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc index 9c737fc..429c5b3 100644 --- a/net/socket/ssl_client_socket_unittest.cc +++ b/net/socket/ssl_client_socket_unittest.cc @@ -1896,7 +1896,7 @@ TEST_F(SSLClientSocketTest, Read_WithAsyncZeroReturn) { new SynchronousErrorStreamSocket(real_transport.Pass())); SynchronousErrorStreamSocket* raw_error_socket = error_socket.get(); scoped_ptr<FakeBlockingStreamSocket> transport( - new FakeBlockingStreamSocket(error_socket.Pass())); + new FakeBlockingStreamSocket(error_socket.PassAs<StreamSocket>())); FakeBlockingStreamSocket* raw_transport = transport.get(); int rv = callback.GetResult(transport->Connect(callback.callback())); EXPECT_EQ(OK, rv); @@ -1906,7 +1906,7 @@ TEST_F(SSLClientSocketTest, Read_WithAsyncZeroReturn) { ssl_config.false_start_enabled = false; scoped_ptr<SSLClientSocket> sock( - CreateSSLClientSocket(transport.Pass(), + CreateSSLClientSocket(transport.PassAs<StreamSocket>(), test_server.host_port_pair(), ssl_config)); |