Make operators on scoped_ptr match the ones defined for std::unique_ptr

chrome/browser/prerender/prerender_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/prerender/prerender_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <string>
 #include <vector>
@@ skipping 116 matching lines @@
         suppressed_dialog_(false) {
     tab_->SetDelegate(this);
     base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&OnCloseWebContentsDeleter::ScheduleWebContentsForDeletion,
                    AsWeakPtr(), true),
         base::TimeDelta::FromSeconds(kDeleteWithExtremePrejudiceSeconds));
   }
 
   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;
   }
 
  private:
   static const int kDeleteWithExtremePrejudiceSeconds = 3;
 
   void ScheduleWebContentsForDeletion(bool timeout) {
     UMA_HISTOGRAM_BOOLEAN("Prerender.TabContentsDeleterTimeout", timeout);
     UMA_HISTOGRAM_BOOLEAN("Prerender.TabContentsDeleterSuppressedDialog",
@@ skipping 657 matching lines @@
   }
 };
 
 PrerenderManager::PrerenderData::PrerenderData(PrerenderManager* manager,
                                                PrerenderContents* contents,
                                                base::TimeTicks expiry_time)
     : manager_(manager),
       contents_(contents),
       handle_count_(0),
       expiry_time_(expiry_time) {
-  DCHECK_NE(static_cast<PrerenderContents*>(NULL), contents_);
+  DCHECK(contents_);
 }
 
 PrerenderManager::PrerenderData::~PrerenderData() {
 }
 
 void PrerenderManager::PrerenderData::MakeIntoMatchCompleteReplacement() {
   DCHECK(contents_);
   contents_->set_match_complete_status(
       PrerenderContents::MATCH_COMPLETE_REPLACED);
   PrerenderData* to_delete = new PrerenderData(manager_, contents_.release(),
                                                expiry_time_);
   contents_.reset(to_delete->contents_->CreateMatchCompleteReplacement());
   manager_->to_delete_prerenders_.push_back(to_delete);
 }
 
 void PrerenderManager::PrerenderData::OnHandleCreated(PrerenderHandle* handle) {
-  DCHECK_NE(static_cast<PrerenderContents*>(NULL), contents_);
+  DCHECK(contents_);
   ++handle_count_;
   contents_->AddObserver(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
   // prerender won't be canceled until it times out.
   manager_->SourceNavigatedAway(this);
 }
 
 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_.
     contents_->Destroy(FINAL_STATUS_CANCELLED);
   }
 }
 
 PrerenderContents* PrerenderManager::PrerenderData::ReleaseContents() {
   return contents_.release();
 }
@@ skipping 412 matching lines @@
 }
 
 void PrerenderManager::RenderProcessHostDestroyed(
     content::RenderProcessHost* host) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   size_t erased = prerender_process_hosts_.erase(host);
   DCHECK_EQ(1u, erased);
 }
 
 }  // namespace prerender