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

chrome/renderer/safe_browsing/phishing_classifier.h

 // 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.
 //
 // This class handles the process of extracting all of the features from a
 // page and computing a phishyness score.  The basic steps are:
 //  - Run each feature extractor over the page, building up a FeatureMap of
 //    feature -> value.
 //  - SHA-256 hash all of the feature names in the map so that they match the
 //    supplied model.
@@ skipping 27 matching lines @@
 class Scorer;
 
 class PhishingClassifier {
  public:
   // Callback to be run when phishing classification finishes. The verdict
   // is a ClientPhishingRequest which contains the verdict computed by the
   // classifier as well as the extracted features.  If the verdict.is_phishing()
   // is true, the page is considered phishy by the client-side model,
   // and the browser should ping back to get a final verdict.  The
   // verdict.client_score() is set to kInvalidScore if classification failed.
-  typedef Callback1<const ClientPhishingRequest& /* verdict */>::Type
+  typedef base::Callback<void(const ClientPhishingRequest& /* verdict */)>
       DoneCallback;
 
   static const float kInvalidScore;
 
   // Creates a new PhishingClassifier object that will operate on
   // |render_view|.  |clock| is used to time feature extractor operations, and
   // the PhishingClassifier takes ownership of this object.  Note that the
   // classifier will not be 'ready' until set_phishing_scorer() is called.
   PhishingClassifier(content::RenderView* render_view,
                      FeatureExtractorClock* clock);
@@ skipping 18 matching lines @@
   //
   // To avoid blocking the render thread for too long, phishing classification
   // may run in several chunks of work, posting a task to the current
   // MessageLoop to continue processing.  Once the scoring process is complete,
   // |done_callback| is run on the current thread.  PhishingClassifier takes
   // ownership of the callback.
   //
   // It is an error to call BeginClassification if the classifier is not yet
   // ready.
   virtual void BeginClassification(const string16* page_text,
-                                   DoneCallback* callback);
+                                   const DoneCallback& callback);
 
   // Called by the RenderView (on the render thread) when a page is unloading
   // or the RenderView is being destroyed.  This cancels any extraction that
   // is in progress.  It is an error to call CancelPendingClassification if
   // the classifier is not yet ready.
   virtual void CancelPendingClassification();
 
  private:
   // Any score equal to or above this value is considered phishy.
   static const float kPhishyThreshold;
@@ skipping 31 matching lines @@
   content::RenderView* render_view_;  // owns us
   const Scorer* scorer_;  // owned by the caller
   scoped_ptr<FeatureExtractorClock> clock_;
   scoped_ptr<PhishingUrlFeatureExtractor> url_extractor_;
   scoped_ptr<PhishingDOMFeatureExtractor> dom_extractor_;
   scoped_ptr<PhishingTermFeatureExtractor> term_extractor_;
 
   // State for any in-progress extraction.
   scoped_ptr<FeatureMap> features_;
   const string16* page_text_;  // owned by the caller
-  scoped_ptr<DoneCallback> done_callback_;
+  DoneCallback done_callback_;
 
   // Used in scheduling BeginFeatureExtraction tasks.
   // These pointers are invalidated if classification is cancelled.
   base::WeakPtrFactory<PhishingClassifier> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PhishingClassifier);
 };
 
 }  // namespace safe_browsing
 
 #endif  // CHROME_RENDERER_SAFE_BROWSING_PHISHING_CLASSIFIER_H_