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

Unified Diff: content/browser/loader/resource_loader.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_loader.cc
diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc
index 63195120388f9192f002504600611ac05d3dfe73..a984b20ae0ed3e00cf5371fe75017589d16907e2 100644
--- a/content/browser/loader/resource_loader.cc
+++ b/content/browser/loader/resource_loader.cc
@@ -70,9 +70,9 @@ ResourceLoader::ResourceLoader(scoped_ptr<net::URLRequest> request,
}
ResourceLoader::~ResourceLoader() {
- if (login_delegate_)
+ if (login_delegate_.get())
login_delegate_->OnRequestCancelled();
- if (ssl_client_auth_handler_)
+ if (ssl_client_auth_handler_.get())
ssl_client_auth_handler_->OnRequestCancelled();
// Run ResourceHandler destructor before we tear-down the rest of our state
@@ -250,10 +250,10 @@ void ResourceLoader::OnReceivedRedirect(net::URLRequest* unused,
}
scoped_refptr<ResourceResponse> response(new ResourceResponse());
- PopulateResourceResponse(request_.get(), response);
+ PopulateResourceResponse(request_.get(), response.get());
- if (!handler_->OnRequestRedirected(info->GetRequestID(), new_url, response,
- defer)) {
+ if (!handler_->OnRequestRedirected(
+ info->GetRequestID(), new_url, response.get(), defer)) {
Cancel();
} else if (*defer) {
deferred_stage_ = DEFERRED_REDIRECT; // Follow redirect when resumed.
@@ -277,10 +277,10 @@ void ResourceLoader::OnAuthRequired(net::URLRequest* unused,
// Create a login dialog on the UI thread to get authentication data, or pull
// from cache and continue on the IO thread.
- DCHECK(!login_delegate_) <<
- "OnAuthRequired called with login_delegate pending";
+ DCHECK(!login_delegate_.get())
+ << "OnAuthRequired called with login_delegate pending";
login_delegate_ = delegate_->CreateLoginDelegate(this, auth_info);
- if (!login_delegate_)
+ if (!login_delegate_.get())
request_->CancelAuth();
}
@@ -303,8 +303,8 @@ void ResourceLoader::OnCertificateRequested(
}
#endif
- DCHECK(!ssl_client_auth_handler_) <<
- "OnCertificateRequested called with ssl_client_auth_handler pending";
+ DCHECK(!ssl_client_auth_handler_.get())
+ << "OnCertificateRequested called with ssl_client_auth_handler pending";
ssl_client_auth_handler_ = new SSLClientAuthHandler(request_.get(),
cert_info);
ssl_client_auth_handler_->SelectCertificate();
@@ -478,11 +478,11 @@ void ResourceLoader::CancelRequestInternal(int error, bool from_renderer) {
// IO_PENDING?
bool was_pending = request_->is_pending();
- if (login_delegate_) {
+ if (login_delegate_.get()) {
login_delegate_->OnRequestCancelled();
login_delegate_ = NULL;
}
- if (ssl_client_auth_handler_) {
+ if (ssl_client_auth_handler_.get()) {
ssl_client_auth_handler_->OnRequestCancelled();
ssl_client_auth_handler_ = NULL;
}
@@ -504,7 +504,7 @@ void ResourceLoader::CompleteResponseStarted() {
ResourceRequestInfoImpl* info = GetRequestInfo();
scoped_refptr<ResourceResponse> response(new ResourceResponse());
- PopulateResourceResponse(request_.get(), response);
+ PopulateResourceResponse(request_.get(), response.get());
// The --site-per-process flag enables an out-of-process iframes
// prototype. It works by changing the MIME type of cross-site subframe
@@ -534,10 +534,9 @@ void ResourceLoader::CompleteResponseStarted() {
response->head.mime_type = "application/browser-plugin";
}
- if (request_->ssl_info().cert) {
- int cert_id =
- CertStore::GetInstance()->StoreCert(request_->ssl_info().cert,
- info->GetChildID());
+ if (request_->ssl_info().cert.get()) {
+ int cert_id = CertStore::GetInstance()->StoreCert(
+ request_->ssl_info().cert.get(), info->GetChildID());
response->head.security_info = SerializeSecurityInfo(
cert_id,
request_->ssl_info().cert_status,
@@ -553,7 +552,8 @@ void ResourceLoader::CompleteResponseStarted() {
delegate_->DidReceiveResponse(this);
bool defer = false;
- if (!handler_->OnResponseStarted(info->GetRequestID(), response, &defer)) {
+ if (!handler_->OnResponseStarted(
+ info->GetRequestID(), response.get(), &defer)) {
Cancel();
} else if (defer) {
deferred_stage_ = DEFERRED_READ; // Read first chunk when resumed.
@@ -632,8 +632,8 @@ void ResourceLoader::ResponseCompleted() {
std::string security_info;
const net::SSLInfo& ssl_info = request_->ssl_info();
- if (ssl_info.cert != NULL) {
- int cert_id = CertStore::GetInstance()->StoreCert(ssl_info.cert,
+ if (ssl_info.cert.get() != NULL) {
+ int cert_id = CertStore::GetInstance()->StoreCert(ssl_info.cert.get(),
info->GetChildID());
security_info = SerializeSecurityInfo(
cert_id, ssl_info.cert_status, ssl_info.security_bits,
« no previous file with comments | « content/browser/loader/resource_dispatcher_host_unittest.cc ('k') | content/browser/loader/resource_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698