summaryrefslogtreecommitdiffstats
path: root/content/browser/loader/certificate_resource_handler.cc
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-02 21:13:46 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-02 21:13:46 +0000
commitfc72bb18b111ff63e57135d97de6d59291f3b7b8 (patch)
treef7fedf0a0577e38a0486e8bdc88a47a508bf122d /content/browser/loader/certificate_resource_handler.cc
parent7cd76fded67d66fb8ea4f5abce5241ad71d749a9 (diff)
downloadchromium_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/loader/certificate_resource_handler.cc')
-rw-r--r--content/browser/loader/certificate_resource_handler.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/loader/certificate_resource_handler.cc b/content/browser/loader/certificate_resource_handler.cc
index 266b630..af3d075 100644
--- a/content/browser/loader/certificate_resource_handler.cc
+++ b/content/browser/loader/certificate_resource_handler.cc
@@ -68,7 +68,7 @@ bool CertificateResourceHandler::OnWillRead(int request_id,
// TODO(gauravsh): Should we use 'min_size' here?
DCHECK(buf && buf_size);
- if (!read_buffer_) {
+ if (!read_buffer_.get()) {
read_buffer_ = new net::IOBuffer(kReadBufSize);
}
*buf = read_buffer_.get();
@@ -84,7 +84,7 @@ bool CertificateResourceHandler::OnReadCompleted(int request_id,
return true;
// We have more data to read.
- DCHECK(read_buffer_);
+ DCHECK(read_buffer_.get());
content_length_ += bytes_read;
// Release the ownership of the buffer, and store a reference
@@ -107,7 +107,7 @@ bool CertificateResourceHandler::OnResponseCompleted(
AssembleResource();
const void* content_bytes = NULL;
- if (resource_buffer_)
+ if (resource_buffer_.get())
content_bytes = resource_buffer_->data();
// Note that it's up to the browser to verify that the certificate
@@ -132,7 +132,7 @@ void CertificateResourceHandler::AssembleResource() {
// Copy the data into it.
size_t bytes_copied = 0;
for (size_t i = 0; i < buffer_.size(); ++i) {
- net::IOBuffer* data = buffer_[i].first;
+ net::IOBuffer* data = buffer_[i].first.get();
size_t data_len = buffer_[i].second;
DCHECK(data != NULL);
DCHECK_LE(bytes_copied + data_len, content_length_);