diff options
| author | yutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 09:13:00 +0000 |
|---|---|---|
| committer | yutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 09:13:00 +0000 |
| commit | 8bbf5b6566dc5cfbe37f35b410671fd3938faf11 (patch) | |
| tree | 524c2061b9a10b10c0f2cc11365b2b792c7423a6 /net/websockets | |
| parent | e1f0fc3623f01ea038b513b1fd92e2f99428a160 (diff) | |
| download | chromium_src-8bbf5b6566dc5cfbe37f35b410671fd3938faf11.zip chromium_src-8bbf5b6566dc5cfbe37f35b410671fd3938faf11.tar.gz chromium_src-8bbf5b6566dc5cfbe37f35b410671fd3938faf11.tar.bz2 | |
Convert TestOldCompletionCallback in WebSocketJobTest.
BUG=105683
TEST=none
Review URL: http://codereview.chromium.org/8763024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112433 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets')
| -rw-r--r-- | net/websockets/websocket_job_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/websockets/websocket_job_unittest.cc b/net/websockets/websocket_job_unittest.cc index ac67ffd..4f6bc97 100644 --- a/net/websockets/websocket_job_unittest.cc +++ b/net/websockets/websocket_job_unittest.cc @@ -332,10 +332,10 @@ class WebSocketJobTest : public PlatformTest { websocket_->SendData(kDataHello, kDataHelloLength); } void DoSync() { - sync_callback_.Run(OK); + sync_test_callback_.callback().Run(OK); } int WaitForResult() { - return sync_callback_.WaitForResult(); + return sync_test_callback_.WaitForResult(); } protected: enum StreamType { @@ -445,7 +445,7 @@ class WebSocketJobTest : public PlatformTest { scoped_refptr<SocketStream> socket_; scoped_ptr<MockClientSocketFactory> socket_factory_; scoped_refptr<OrderedSocketData> data_; - TestOldCompletionCallback sync_callback_; + TestCompletionCallback sync_test_callback_; scoped_refptr<MockSSLConfigService> ssl_config_service_; scoped_ptr<net::ProxyService> proxy_service_; scoped_ptr<net::MockHostResolver> host_resolver_; |