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

4 files changed, 13 insertions, 13 deletions

diff --git a/webkit/glue/resource_request_body_unittest.cc b/webkit/glue/resource_request_body_unittest.cc
index ecb7278..7577a26 100644
--- a/webkit/glue/resource_request_body_unittest.cc
+++ b/webkit/glue/resource_request_body_unittest.cc
@@ -102,14 +102,14 @@ TEST(ResourceRequestBodyTest, ResolveBlobAndCreateUploadDataStream) {
   scoped_refptr<BlobData> blob_data(new BlobData());
 
   GURL blob_url0("blob://url_0");
-  blob_storage_controller.AddFinishedBlob(blob_url0, blob_data);
+  blob_storage_controller.AddFinishedBlob(blob_url0, blob_data.get());
 
   blob_data->AppendData("BlobData");
   blob_data->AppendFile(
       base::FilePath(FILE_PATH_LITERAL("BlobFile.txt")), 0, 20, time1);
 
   GURL blob_url1("blob://url_1");
-  blob_storage_controller.AddFinishedBlob(blob_url1, blob_data);
+  blob_storage_controller.AddFinishedBlob(blob_url1, blob_data.get());
 
   GURL blob_url2("blob://url_2");
   blob_storage_controller.CloneBlob(blob_url2, blob_url1);
diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc
index 0d33d2e8..c4d9e52 100644
--- a/webkit/glue/webkitplatformsupport_impl.cc
+++ b/webkit/glue/webkitplatformsupport_impl.cc
@@ -829,10 +829,10 @@ WebKit::WebThread* WebKitPlatformSupportImpl::currentThread() {
 
   scoped_refptr<base::MessageLoopProxy> message_loop =
       base::MessageLoopProxy::current();
-  if (!message_loop)
+  if (!message_loop.get())
     return NULL;
 
-  thread = new WebThreadImplForMessageLoop(message_loop);
+  thread = new WebThreadImplForMessageLoop(message_loop.get());
   current_thread_slot_.Set(thread);
   return thread;
 }
diff --git a/webkit/glue/websocketstreamhandle_impl.cc b/webkit/glue/websocketstreamhandle_impl.cc
index 3a68cbb..9d6ac9d 100644
--- a/webkit/glue/websocketstreamhandle_impl.cc
+++ b/webkit/glue/websocketstreamhandle_impl.cc
@@ -64,7 +64,7 @@ class WebSocketStreamHandleImpl::Context
   virtual ~Context() {
     DCHECK(!handle_);
     DCHECK(!client_);
-    DCHECK(!bridge_);
+    DCHECK(!bridge_.get());
   }
 
   WebSocketStreamHandleImpl* handle_;
@@ -86,7 +86,7 @@ void WebSocketStreamHandleImpl::Context::Connect(
     const WebURL& url,
     WebKitPlatformSupportImpl* platform) {
   VLOG(1) << "Connect url=" << url;
-  DCHECK(!bridge_);
+  DCHECK(!bridge_.get());
   bridge_ = platform->CreateWebSocketBridge(handle_, this);
   AddRef();  // Will be released by DidClose().
   bridge_->Connect(url);
@@ -94,14 +94,14 @@ void WebSocketStreamHandleImpl::Context::Connect(
 
 bool WebSocketStreamHandleImpl::Context::Send(const WebData& data) {
   VLOG(1) << "Send data.size=" << data.size();
-  DCHECK(bridge_);
+  DCHECK(bridge_.get());
   return bridge_->Send(
       std::vector<char>(data.data(), data.data() + data.size()));
 }
 
 void WebSocketStreamHandleImpl::Context::Close() {
   VLOG(1) << "Close";
-  if (bridge_)
+  if (bridge_.get())
     bridge_->Close();
 }
 
@@ -112,7 +112,7 @@ void WebSocketStreamHandleImpl::Context::Detach() {
   // the |bridge_| here.  Then |bridge_| will call back DidClose, and will
   // be released by itself.
   // Otherwise, |bridge_| is NULL.
-  if (bridge_)
+  if (bridge_.get())
     bridge_->Close();
 }
 
diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc
index fcfeb8c..1916ffc 100644
--- a/webkit/glue/weburlloader_impl.cc
+++ b/webkit/glue/weburlloader_impl.cc
@@ -222,7 +222,7 @@ void PopulateURLResponse(
     response->setLoadTiming(timing);
   }
 
-  if (info.devtools_info) {
+  if (info.devtools_info.get()) {
     WebHTTPLoadInfo load_info;
 
     load_info.setHTTPStatusCode(info.devtools_info->http_status_code);
@@ -250,7 +250,7 @@ void PopulateURLResponse(
     response->setHTTPLoadInfo(load_info);
   }
 
-  const net::HttpResponseHeaders* headers = info.headers;
+  const net::HttpResponseHeaders* headers = info.headers.get();
   if (!headers)
     return;
 
@@ -552,7 +552,7 @@ void WebURLLoaderImpl::Context::Start(
       }
     }
     request_body->set_identifier(request.httpBody().identifier());
-    bridge_->SetRequestBody(request_body);
+    bridge_->SetRequestBody(request_body.get());
   }
 
   if (sync_load_response) {
@@ -646,7 +646,7 @@ void WebURLLoaderImpl::Context::OnReceivedResponse(
 
   DCHECK(!ftp_listing_delegate_.get());
   DCHECK(!multipart_delegate_.get());
-  if (info.headers && info.mime_type == "multipart/x-mixed-replace") {
+  if (info.headers.get() && info.mime_type == "multipart/x-mixed-replace") {
     std::string content_type;
     info.headers->EnumerateHeader(NULL, "content-type", &content_type);