Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Unified Diff: content/browser/loader/resource_dispatcher_host_impl.cc

Issue 16294003: Update content/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/loader/resource_dispatcher_host_impl.cc
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index d5239bc50f1c58edb49a66919d646347a69b3447..8181869ebfaa4dd320453fdc43ecbab1d22d3dba 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;
@@ -1009,7 +1009,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(),
« no previous file with comments | « content/browser/loader/resource_dispatcher_host_impl.h ('k') | content/browser/loader/resource_dispatcher_host_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698