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

Unified Diff: chrome/browser/prerender/prerender_manager.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: chrome/browser/prerender/prerender_manager.cc
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc
index bd9b2535fe48563a9fb882dd284e6299faabc293..59ace6e9e222c96ff24e5653a2420b0d625c0414 100644
--- a/chrome/browser/prerender/prerender_manager.cc
+++ b/chrome/browser/prerender/prerender_manager.cc
@@ -134,19 +134,19 @@ class PrerenderManager::OnCloseWebContentsDeleter
}
void CloseContents(WebContents* source) override {
- DCHECK_EQ(tab_, source);
+ DCHECK_EQ(tab_.get(), source);
ScheduleWebContentsForDeletion(false);
}
void SwappedOut(WebContents* source) override {
- DCHECK_EQ(tab_, source);
+ DCHECK_EQ(tab_.get(), source);
ScheduleWebContentsForDeletion(false);
}
bool ShouldSuppressDialogs(WebContents* source) override {
// Use this as a proxy for getting statistics on how often we fail to honor
// the beforeunload event.
- DCHECK_EQ(tab_, source);
+ DCHECK_EQ(tab_.get(), source);
suppressed_dialog_ = true;
return true;
}
@@ -824,7 +824,7 @@ PrerenderManager::PrerenderData::PrerenderData(PrerenderManager* manager,
contents_(contents),
handle_count_(0),
expiry_time_(expiry_time) {
- DCHECK_NE(static_cast<PrerenderContents*>(NULL), contents_);
+ DCHECK(contents_);
}
PrerenderManager::PrerenderData::~PrerenderData() {
@@ -841,7 +841,7 @@ void PrerenderManager::PrerenderData::MakeIntoMatchCompleteReplacement() {
}
void PrerenderManager::PrerenderData::OnHandleCreated(PrerenderHandle* handle) {
- DCHECK_NE(static_cast<PrerenderContents*>(NULL), contents_);
+ DCHECK(contents_);
++handle_count_;
contents_->AddObserver(handle);
}
@@ -849,7 +849,7 @@ void PrerenderManager::PrerenderData::OnHandleCreated(PrerenderHandle* handle) {
void PrerenderManager::PrerenderData::OnHandleNavigatedAway(
PrerenderHandle* handle) {
DCHECK_LT(0, handle_count_);
- DCHECK_NE(static_cast<PrerenderContents*>(NULL), contents_);
+ DCHECK(contents_);
if (abandon_time_.is_null())
abandon_time_ = base::TimeTicks::Now();
// We intentionally don't decrement the handle count here, so that the
@@ -860,7 +860,7 @@ void PrerenderManager::PrerenderData::OnHandleNavigatedAway(
void PrerenderManager::PrerenderData::OnHandleCanceled(
PrerenderHandle* handle) {
DCHECK_LT(0, handle_count_);
- DCHECK_NE(static_cast<PrerenderContents*>(NULL), contents_);
+ DCHECK(contents_);
if (--handle_count_ == 0) {
// This will eventually remove this object from active_prerenders_.

Powered by Google App Engine
This is Rietveld 408576698