| Index: webkit/tools/test_shell/simple_socket_stream_bridge.cc
|
| diff --git a/webkit/tools/test_shell/simple_socket_stream_bridge.cc b/webkit/tools/test_shell/simple_socket_stream_bridge.cc
|
| index 50723f0c6a20d1bde4b1a2ff8b7fa6a5acee244b..23253ccd74513ecab518f028ed0d63ab8001a04f 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;
|
|
|