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

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

Issue 498553004: Remove implicit conversions from scoped_refptr to T* in content/browser/loader/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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
« no previous file with comments | « no previous file | content/browser/loader/detachable_resource_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/loader/cross_site_resource_handler.cc
diff --git a/content/browser/loader/cross_site_resource_handler.cc b/content/browser/loader/cross_site_resource_handler.cc
index 664f34917d21ffc4013e4d0f7d9e1eb06430a57c..a812fd92b4d30c5cb29704c8e7dfd0faaf8ada19 100644
--- a/content/browser/loader/cross_site_resource_handler.cc
+++ b/content/browser/loader/cross_site_resource_handler.cc
@@ -150,7 +150,7 @@ bool CrossSiteResourceHandler::OnResponseStarted(
&transition_data);
if (is_navigation_transition) {
- if (response_)
+ if (response_.get())
transition_data.response_headers = response_->head.headers;
transition_data.request_url = request()->url();
@@ -249,7 +249,7 @@ bool CrossSiteResourceHandler::OnNavigationTransitionResponseStarted(
void CrossSiteResourceHandler::ResumeResponseDeferredAtStart(int request_id) {
bool defer = false;
- if (!OnNormalResponseStarted(response_, &defer)) {
+ if (!OnNormalResponseStarted(response_.get(), &defer)) {
controller()->Cancel();
} else if (!defer) {
ResumeIfDeferred();
@@ -258,7 +258,7 @@ void CrossSiteResourceHandler::ResumeResponseDeferredAtStart(int request_id) {
void CrossSiteResourceHandler::ResumeOrTransfer(bool is_transfer) {
if (is_transfer) {
- StartCrossSiteTransition(response_);
+ StartCrossSiteTransition(response_.get());
} else {
ResumeResponse();
}
@@ -299,7 +299,7 @@ void CrossSiteResourceHandler::ResumeResponse() {
if (has_started_response_) {
// Send OnResponseStarted to the new renderer.
- DCHECK(response_);
+ DCHECK(response_.get());
bool defer = false;
if (!next_handler_->OnResponseStarted(response_.get(), &defer)) {
controller()->Cancel();
« no previous file with comments | « no previous file | content/browser/loader/detachable_resource_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698