diff options
author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 21:13:46 +0000 |
---|---|---|
committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 21:13:46 +0000 |
commit | fc72bb18b111ff63e57135d97de6d59291f3b7b8 (patch) | |
tree | f7fedf0a0577e38a0486e8bdc88a47a508bf122d /content/browser/webui/url_data_manager_backend.cc | |
parent | 7cd76fded67d66fb8ea4f5abce5241ad71d749a9 (diff) | |
download | chromium_src-fc72bb18b111ff63e57135d97de6d59291f3b7b8.zip chromium_src-fc72bb18b111ff63e57135d97de6d59291f3b7b8.tar.gz chromium_src-fc72bb18b111ff63e57135d97de6d59291f3b7b8.tar.bz2 |
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
Diffstat (limited to 'content/browser/webui/url_data_manager_backend.cc')
-rw-r--r-- | content/browser/webui/url_data_manager_backend.cc | 10 |
1 files changed, 5 insertions, 5 deletions
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; |