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/loader/resource_dispatcher_host_impl.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/loader/resource_dispatcher_host_impl.cc')
| -rw-r--r-- | content/browser/loader/resource_dispatcher_host_impl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc index ee54f68..b1b13a4 100644 --- a/content/browser/loader/resource_dispatcher_host_impl.cc +++ b/content/browser/loader/resource_dispatcher_host_impl.cc @@ -182,7 +182,7 @@ bool ShouldServiceRequest(int process_type, } // Check if the renderer is permitted to upload the requested files. - if (request_data.request_body) { + if (request_data.request_body.get()) { const std::vector<ResourceRequestBody::Element>* uploads = request_data.request_body->elements(); std::vector<ResourceRequestBody::Element>::const_iterator iter; @@ -280,8 +280,8 @@ int BuildLoadFlagsForRequest( } int GetCertID(net::URLRequest* request, int child_id) { - if (request->ssl_info().cert) { - return CertStore::GetInstance()->StoreCert(request->ssl_info().cert, + if (request->ssl_info().cert.get()) { + return CertStore::GetInstance()->StoreCert(request->ssl_info().cert.get(), child_id); } return 0; @@ -1017,7 +1017,7 @@ void ResourceDispatcherHostImpl::BeginRequest( request->SetPriority(request_data.priority); // Resolve elements from request_body and prepare upload data. - if (request_data.request_body) { + if (request_data.request_body.get()) { request->set_upload(make_scoped_ptr( request_data.request_body->ResolveElementsAndCreateUploadDataStream( filter_->blob_storage_context()->controller(), |