Update content/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

Linux fixes

BUG=110610
TBR=darin

Review URL: https://chromiumcodereview.appspot.com/16294003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203624 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 8 insertions, 8 deletions

diff --git a/content/browser/webui/shared_resources_data_source.cc b/content/browser/webui/shared_resources_data_source.cc
index fc390b2..23cdc3d 100644
--- a/content/browser/webui/shared_resources_data_source.cc
+++ b/content/browser/webui/shared_resources_data_source.cc
@@ -48,7 +48,7 @@ void SharedResourcesDataSource::StartDataRequest(
   scoped_refptr<base::RefCountedStaticMemory> bytes(
       content::GetContentClient()->GetDataResourceBytes(idr));
 
-  callback.Run(bytes);
+  callback.Run(bytes.get());
 }
 
 std::string SharedResourcesDataSource::GetMimeType(
diff --git a/content/browser/webui/url_data_manager_backend.cc b/content/browser/webui/url_data_manager_backend.cc
index ab964d0..4284f0e 100644
--- a/content/browser/webui/url_data_manager_backend.cc
+++ b/content/browser/webui/url_data_manager_backend.cc
@@ -246,7 +246,7 @@ int URLRequestChromeJob::GetResponseCode() const {
 }
 
 void URLRequestChromeJob::GetResponseInfo(net::HttpResponseInfo* info) {
-  DCHECK(!info->headers);
+  DCHECK(!info->headers.get());
   // Set the headers so that requests serviced by ChromeURLDataManager return a
   // status code of 200. Without this they return a 0, which makes the status
   // indistiguishable from other error types. Instant relies on getting a 200.
@@ -283,9 +283,9 @@ void URLRequestChromeJob::DataAvailable(base::RefCountedMemory* bytes) {
 
     data_ = bytes;
     int bytes_read;
-    if (pending_buf_) {
+    if (pending_buf_.get()) {
       CHECK(pending_buf_->data());
-      CompleteRead(pending_buf_, pending_buf_size_, &bytes_read);
+      CompleteRead(pending_buf_.get(), pending_buf_size_, &bytes_read);
       pending_buf_ = NULL;
       NotifyReadComplete(bytes_read);
     }
@@ -298,7 +298,7 @@ void URLRequestChromeJob::DataAvailable(base::RefCountedMemory* bytes) {
 
 bool URLRequestChromeJob::ReadRawData(net::IOBuffer* buf, int buf_size,
                                       int* bytes_read) {
-  if (!data_) {
+  if (!data_.get()) {
     SetStatus(net::URLRequestStatus(net::URLRequestStatus::IO_PENDING, 0));
     DCHECK(!pending_buf_.get());
     CHECK(buf->data());
@@ -492,7 +492,7 @@ bool URLDataManagerBackend::StartRequest(const net::URLRequest* request,
   if (i == data_sources_.end())
     return false;
 
-  URLDataSourceImpl* source = i->second;
+  URLDataSourceImpl* source = i->second.get();
 
   if (!source->source()->ShouldServiceRequest(request))
     return false;
diff --git a/content/browser/webui/url_data_source_impl.cc b/content/browser/webui/url_data_source_impl.cc
index d206207..2d89439 100644
--- a/content/browser/webui/url_data_source_impl.cc
+++ b/content/browser/webui/url_data_source_impl.cc
@@ -53,7 +53,7 @@ void URLDataSourceImpl::SendResponseOnIOThread(
     scoped_refptr<base::RefCountedMemory> bytes) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (backend_)
-    backend_->DataAvailable(request_id, bytes);
+    backend_->DataAvailable(request_id, bytes.get());
 }
 
 }  // namespace content
diff --git a/content/browser/webui/web_ui_data_source_impl.cc b/content/browser/webui/web_ui_data_source_impl.cc
index 7ca34d2..e3c443a 100644
--- a/content/browser/webui/web_ui_data_source_impl.cc
+++ b/content/browser/webui/web_ui_data_source_impl.cc
@@ -213,7 +213,7 @@ void WebUIDataSourceImpl::SendFromResourceBundle(
     const URLDataSource::GotDataCallback& callback, int idr) {
   scoped_refptr<base::RefCountedStaticMemory> response(
       GetContentClient()->GetDataResourceBytes(idr));
-  callback.Run(response);
+  callback.Run(response.get());
 }
 
 }  // namespace content