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

Unified Diff: content/browser/appcache/appcache_update_job.cc

Issue 1440593004: Make operators on scoped_ptr match the ones defined for std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrequals: followupfix-after-rebase Created 5 years, 1 month 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/appcache/appcache_update_job.cc
diff --git a/content/browser/appcache/appcache_update_job.cc b/content/browser/appcache/appcache_update_job.cc
index ff065503c4deb7afec59aae1bc2645d02b06d095..e0c237261388f379a8370688a0acb8849bf1eb63 100644
--- a/content/browser/appcache/appcache_update_job.cc
+++ b/content/browser/appcache/appcache_update_job.cc
@@ -174,7 +174,7 @@ void AppCacheUpdateJob::URLFetcher::OnReceivedRedirect(
net::URLRequest* request,
const net::RedirectInfo& redirect_info,
bool* defer_redirect) {
- DCHECK(request_ == request);
+ DCHECK_EQ(request_.get(), request);
// Redirect is not allowed by the update process.
job_->MadeProgress();
redirect_response_code_ = request->GetResponseCode();
@@ -185,7 +185,7 @@ void AppCacheUpdateJob::URLFetcher::OnReceivedRedirect(
void AppCacheUpdateJob::URLFetcher::OnResponseStarted(
net::URLRequest *request) {
- DCHECK(request == request_);
+ DCHECK_EQ(request_.get(), request);
int response_code = -1;
if (request->status().is_success()) {
response_code = request->GetResponseCode();
@@ -244,7 +244,7 @@ void AppCacheUpdateJob::URLFetcher::OnResponseStarted(
void AppCacheUpdateJob::URLFetcher::OnReadCompleted(
net::URLRequest* request, int bytes_read) {
- DCHECK(request_ == request);
+ DCHECK_EQ(request_.get(), request);
bool data_consumed = true;
if (request->status().is_success() && bytes_read > 0) {
job_->MadeProgress();
@@ -270,7 +270,8 @@ void AppCacheUpdateJob::URLFetcher::OnReadCompleted(
void AppCacheUpdateJob::URLFetcher::AddConditionalHeaders(
const net::HttpResponseHeaders* headers) {
- DCHECK(request_.get() && headers);
+ DCHECK(request_);
+ DCHECK(headers);
net::HttpRequestHeaders extra_headers;
// Add If-Modified-Since header if response info has Last-Modified header.
« no previous file with comments | « components/sync_driver/profile_sync_auth_provider.cc ('k') | content/browser/frame_host/render_frame_host_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698