Remove implicit scoped_refptr operator T*

net/websockets/websocket_job.cc

Index: net/websockets/websocket_job.cc
diff --git a/net/websockets/websocket_job.cc b/net/websockets/websocket_job.cc
index ff60ebeaa1ad45386df31f12462418afa64acd99..1d8424afcf8b896bd8f3485f453a4a5269c52917 100644
--- a/net/websockets/websocket_job.cc
+++ b/net/websockets/websocket_job.cc
@@ -110,7 +110,7 @@ bool WebSocketJob::SendData(const char* data, int len) {
       {
         scoped_refptr<IOBufferWithSize> buffer = new IOBufferWithSize(len);
         memcpy(buffer->data(), data, len);
-        if (current_send_buffer_ || !send_buffer_queue_.empty()) {
+        if (current_send_buffer_.get() || !send_buffer_queue_.empty()) {
           send_buffer_queue_.push_back(buffer);
           return true;
         }
@@ -131,7 +131,7 @@ void WebSocketJob::Close() {
     return;
 
   state_ = CLOSING;
-  if (current_send_buffer_) {
+  if (current_send_buffer_.get()) {
     // Will close in SendPending.
     return;
   }
@@ -154,7 +154,7 @@ void WebSocketJob::DetachDelegate() {
   weak_ptr_factory_for_send_pending_.InvalidateWeakPtrs();
 
   delegate_ = NULL;
-  if (socket_)
+  if (socket_.get())
     socket_->DetachDelegate();
   socket_ = NULL;
   if (!callback_.is_null()) {
@@ -204,7 +204,7 @@ void WebSocketJob::OnSentData(SocketStream* socket, int amount_sent) {
   }
   if (delegate_) {
     DCHECK(state_ == OPEN || state_ == CLOSING);
-    if (!current_send_buffer_) {
+    if (!current_send_buffer_.get()) {
       VLOG(1) << "OnSentData current_send_buffer=NULL amount_sent="
               << amount_sent;
       return;
@@ -301,7 +301,7 @@ void WebSocketJob::OnSentSpdyHeaders(int result) {
   if (state_ != CONNECTING)
     return;
   if (delegate_)
-    delegate_->OnSentData(socket_, handshake_request_->original_length());
+    delegate_->OnSentData(socket_.get(), handshake_request_->original_length());
   handshake_request_.reset();
 }
 
@@ -328,7 +328,7 @@ void WebSocketJob::OnSentSpdyData(int amount_sent) {
     return;
   if (!spdy_websocket_stream_.get())
     return;
-  OnSentData(socket_, amount_sent);
+  OnSentData(socket_.get(), amount_sent);
 }
 
 void WebSocketJob::OnReceivedSpdyData(const char* data, int length) {
@@ -338,12 +338,12 @@ void WebSocketJob::OnReceivedSpdyData(const char* data, int length) {
     return;
   if (!spdy_websocket_stream_.get())
     return;
-  OnReceivedData(socket_, data, length);
+  OnReceivedData(socket_.get(), data, length);
 }
 
 void WebSocketJob::OnCloseSpdyStream() {
   spdy_websocket_stream_.reset();
-  OnClose(socket_);
+  OnClose(socket_.get());
 }
 
 bool WebSocketJob::SendHandshakeRequest(const char* data, int len) {
@@ -362,10 +362,10 @@ bool WebSocketJob::SendHandshakeRequest(const char* data, int len) {
 
 void WebSocketJob::AddCookieHeaderAndSend() {
   bool allow = true;
-  if (delegate_ && !delegate_->CanGetCookies(socket_, GetURLForCookies()))
+  if (delegate_ && !delegate_->CanGetCookies(socket_.get(), GetURLForCookies()))
     allow = false;
 
-  if (socket_ && delegate_ && state_ == CONNECTING) {
+  if (socket_.get() && delegate_ && state_ == CONNECTING) {
     handshake_request_->RemoveHeaders(
         kCookieHeaders, arraysize(kCookieHeaders));
     if (allow && socket_->context()->cookie_store()) {
@@ -489,7 +489,7 @@ void WebSocketJob::SaveNextCookie() {
     DCHECK(!received_data.empty());
     if (delegate_)
       delegate_->OnReceivedData(
-          socket_, &received_data.front(), received_data.size());
+          socket_.get(), &received_data.front(), received_data.size());
 
     handshake_response_.reset();
 
@@ -502,10 +502,12 @@ void WebSocketJob::SaveNextCookie() {
   CookieOptions options;
   GURL url = GetURLForCookies();
   std::string cookie = response_cookies_[response_cookies_save_index_];
-  if (delegate_ && !delegate_->CanSetCookie(socket_, url, cookie, &options))
+  if (
+      delegate_ && !delegate_->
+      CanSetCookie(socket_.get(), url, cookie, &options))
     allow = false;
 
-  if (socket_ && delegate_ && state_ == CONNECTING) {
+  if (socket_.get() && delegate_ && state_ == CONNECTING) {
     response_cookies_save_index_++;
     if (allow && socket_->context()->cookie_store()) {
       options.set_include_httponly();
@@ -571,12 +573,13 @@ int WebSocketJob::TrySpdyStream() {
 
   // Create SpdyWebSocketStream.
   spdy_protocol_version_ = spdy_session->GetProtocolVersion();
-  spdy_websocket_stream_.reset(new SpdyWebSocketStream(spdy_session, this));
+  spdy_websocket_stream_.reset(
+      new SpdyWebSocketStream(spdy_session.get(), this));
 
   int result = spdy_websocket_stream_->InitializeStream(
       socket_->url(), MEDIUM, *socket_->net_log());
   if (result == OK) {
-    OnConnected(socket_, kMaxPendingSendAllowed);
+    OnConnected(socket_.get(), kMaxPendingSendAllowed);
     return ERR_PROTOCOL_SWITCHED;
   }
   if (result != ERR_IO_PENDING) {
@@ -641,7 +644,7 @@ void WebSocketJob::CloseInternal() {
 }
 
 void WebSocketJob::SendPending() {
-  if (current_send_buffer_)
+  if (current_send_buffer_.get())
     return;
 
   // Current buffer has been sent. Try next if any.
@@ -654,7 +657,7 @@ void WebSocketJob::SendPending() {
 
   scoped_refptr<IOBufferWithSize> next_buffer = send_buffer_queue_.front();
   send_buffer_queue_.pop_front();
-  current_send_buffer_ = new DrainableIOBuffer(next_buffer,
+  current_send_buffer_ = new DrainableIOBuffer(next_buffer.get(),
                                                next_buffer->size());
   SendDataInternal(current_send_buffer_->data(),
                    current_send_buffer_->BytesRemaining());