diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 23:47:38 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 23:47:38 +0000 |
| commit | ff875be5f3f3db4cdc5bbfe4a014580867c7a044 (patch) | |
| tree | e59c4716dc0b4bd427dd84bfa8e15a16aaf50eab /webkit/tools/test_shell/simple_socket_stream_bridge.cc | |
| parent | ed264deb5072425ac355bf4b4cc3d43059ddae94 (diff) | |
| download | chromium_src-ff875be5f3f3db4cdc5bbfe4a014580867c7a044.zip chromium_src-ff875be5f3f3db4cdc5bbfe4a014580867c7a044.tar.gz chromium_src-ff875be5f3f3db4cdc5bbfe4a014580867c7a044.tar.bz2 | |
Update webkit/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes
BUG=110610
TBR=darin
Review URL: https://chromiumcodereview.appspot.com/16155009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/simple_socket_stream_bridge.cc')
| -rw-r--r-- | webkit/tools/test_shell/simple_socket_stream_bridge.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/simple_socket_stream_bridge.cc b/webkit/tools/test_shell/simple_socket_stream_bridge.cc index 50723f0..23253cc 100644 --- a/webkit/tools/test_shell/simple_socket_stream_bridge.cc +++ b/webkit/tools/test_shell/simple_socket_stream_bridge.cc @@ -178,7 +178,7 @@ void WebSocketStreamHandleBridgeImpl::DoConnect(const GURL& url) { void WebSocketStreamHandleBridgeImpl::DoSend(std::vector<char>* data) { DCHECK(base::MessageLoop::current() == g_io_thread); scoped_ptr<std::vector<char> > scoped_data(data); - if (!socket_) + if (!socket_.get()) return; if (!socket_->SendData(&(data->at(0)), data->size())) socket_->Close(); @@ -186,7 +186,7 @@ void WebSocketStreamHandleBridgeImpl::DoSend(std::vector<char>* data) { void WebSocketStreamHandleBridgeImpl::DoClose() { DCHECK(base::MessageLoop::current() == g_io_thread); - if (!socket_) + if (!socket_.get()) return; socket_->Close(); } @@ -220,7 +220,7 @@ void WebSocketStreamHandleBridgeImpl::DoOnClose() { base::subtle::NoBarrier_AtomicIncrement(&num_pending_tasks_, -1); // Don't handle OnClose if there are pending tasks. DCHECK_EQ(num_pending_tasks_, 0); - DCHECK(!socket_); + DCHECK(!socket_.get()); DCHECK_EQ(socket_id_, kNoSocketId); webkit_glue::WebSocketStreamHandleDelegate* delegate = delegate_; delegate_ = NULL; |