Convert to base::Callback in safe_browsing client-side-detection code.

chrome/renderer/safe_browsing/phishing_dom_feature_extractor.cc

 // Copyright (c) 2011 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/renderer/safe_browsing/phishing_dom_feature_extractor.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/hash_tables.h"
 #include "base/logging.h"
@@ skipping 97 matching lines @@
 }
 
 PhishingDOMFeatureExtractor::~PhishingDOMFeatureExtractor() {
   // The RenderView should have called CancelPendingExtraction() before
   // we are destroyed.
   CheckNoPendingExtraction();
 }
 
 void PhishingDOMFeatureExtractor::ExtractFeatures(
     FeatureMap* features,
-    DoneCallback* done_callback) {
+    const DoneCallback& done_callback) {
   // The RenderView should have called CancelPendingExtraction() before
   // starting a new extraction, so DCHECK this.
   CheckNoPendingExtraction();
   // However, in an opt build, we will go ahead and clean up the pending
   // extraction so that we can start in a known state.
   CancelPendingExtraction();
 
   features_ = features;
-  done_callback_.reset(done_callback);
+  done_callback_ = done_callback;
 
   page_feature_state_.reset(new PageFeatureState(clock_->Now()));
   WebKit::WebView* web_view = render_view_->GetWebView();
   if (web_view && web_view->mainFrame()) {
     cur_document_ = web_view->mainFrame()->document();
   }
 
   MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&PhishingDOMFeatureExtractor::ExtractFeaturesWithTimeout,
@@ skipping 203 matching lines @@
     ++page_feature_state_->num_text_inputs;
   }
 }
 
 void PhishingDOMFeatureExtractor::HandleScript(
     const WebKit::WebElement& element) {
   ++page_feature_state_->num_script_tags;
 }
 
 void PhishingDOMFeatureExtractor::CheckNoPendingExtraction() {
-  DCHECK(!done_callback_.get());
+  DCHECK(done_callback_.is_null());
   DCHECK(!cur_frame_data_.get());
   DCHECK(cur_document_.isNull());
-  if (done_callback_.get() || cur_frame_data_.get() ||
+  if (!done_callback_.is_null() || cur_frame_data_.get() ||
       !cur_document_.isNull()) {
     LOG(ERROR) << "Extraction in progress, missing call to "
                << "CancelPendingExtraction";
   }
 }
 
 void PhishingDOMFeatureExtractor::RunCallback(bool success) {
   // Record some timing stats that we can use to evaluate feature extraction
   // performance.  These include both successful and failed extractions.
   DCHECK(page_feature_state_.get());
   UMA_HISTOGRAM_COUNTS("SBClientPhishing.DOMFeatureIterations",
                        page_feature_state_->num_iterations);
   UMA_HISTOGRAM_TIMES("SBClientPhishing.DOMFeatureTotalTime",
                       clock_->Now() - page_feature_state_->start_time);
 
-  DCHECK(done_callback_.get());
-  done_callback_->Run(success);
+  DCHECK(!done_callback_.is_null());
+  done_callback_.Run(success);
   Clear();
 }
 
 void PhishingDOMFeatureExtractor::Clear() {
   features_ = NULL;
-  done_callback_.reset(NULL);
+  done_callback_.Reset();
   cur_frame_data_.reset(NULL);
   cur_document_.reset();
 }
 
 void PhishingDOMFeatureExtractor::ResetFrameData() {
   DCHECK(!cur_document_.isNull());
   DCHECK(!cur_frame_data_.get());
 
   cur_frame_data_.reset(new FrameData());
   cur_frame_data_->elements = cur_document_.all();
@@ skipping 102 matching lines @@
   // Record number of script tags (discretized for numerical stability.)
   if (page_feature_state_->num_script_tags > 1) {
     features_->AddBooleanFeature(features::kPageNumScriptTagsGTOne);
     if (page_feature_state_->num_script_tags > 6) {
       features_->AddBooleanFeature(features::kPageNumScriptTagsGTSix);
     }
   }
 }
 
 }  // namespace safe_browsing