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

chrome/renderer/safe_browsing/phishing_dom_feature_extractor.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.
 //
 // PhishingDOMFeatureExtractor handles computing DOM-based features for the
 // client-side phishing detection model.  These include the presence of various
 // types of elements, ratios of external and secure links, and tokens for
 // external domains linked to.
 
 #ifndef CHROME_RENDERER_SAFE_BROWSING_PHISHING_DOM_FEATURE_EXTRACTOR_H_
 #define CHROME_RENDERER_SAFE_BROWSING_PHISHING_DOM_FEATURE_EXTRACTOR_H_
 
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/callback_old.h"
+#include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/task.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 
 class GURL;
 
 namespace WebKit {
 class WebElement;
 }
 
 namespace content {
 class RenderView;
 }
 
 namespace safe_browsing {
 class FeatureExtractorClock;
 class FeatureMap;
 
 class PhishingDOMFeatureExtractor {
  public:
   // Callback to be run when feature extraction finishes.  The callback
   // argument is true if extraction was successful, false otherwise.
-  typedef Callback1<bool>::Type DoneCallback;
+  typedef base::Callback<void(bool)> DoneCallback;
 
   // Creates a PhishingDOMFeatureExtractor for the specified RenderView.
   // The PhishingDOMFeatureExtrator should be destroyed prior to destroying
   // the RenderView.  |clock| is used for timing feature extractor operations,
   // and may be mocked for testing.  The caller maintains ownership of the
   // clock.
   PhishingDOMFeatureExtractor(content::RenderView* render_view,
                               FeatureExtractorClock* clock);
   ~PhishingDOMFeatureExtractor();
 
   // Begins extracting features into the given FeatureMap for the page
   // currently loaded in this object's RenderView.  To avoid blocking the
   // render thread for too long, the feature extractor may run in several
   // chunks of work, posting a task to the current MessageLoop to continue
   // processing.  Once feature extraction is complete, |done_callback|
   // is run on the current thread.  PhishingDOMFeatureExtractor takes
   // ownership of the callback.
-  void ExtractFeatures(FeatureMap* features, DoneCallback* done_callback);
+  void ExtractFeatures(FeatureMap* features, const DoneCallback& done_callback);
 
   // Cancels any pending feature extraction.  The DoneCallback will not be run.
   // Must be called if there is a feature extraction in progress when the page
   // is unloaded or the PhishingDOMFeatureExtractor is destroyed.
   void CancelPendingExtraction();
 
  private:
   struct FrameData;
   struct PageFeatureState;
 
@@ skipping 56 matching lines @@
   void InsertFeatures();
 
   // Non-owned pointer to the view that we will extract features from.
   content::RenderView* render_view_;
 
   // Non-owned pointer to our clock.
   FeatureExtractorClock* clock_;
 
   // The output parameters from the most recent call to ExtractFeatures().
   FeatureMap* features_;  // The caller keeps ownership of this.
-  scoped_ptr<DoneCallback> done_callback_;
+  DoneCallback done_callback_;
 
   // The current (sub-)document that we are processing.  May be a null document
   // (isNull()) if we are not currently extracting features.
   WebKit::WebDocument cur_document_;
 
   // Stores extra state for |cur_document_| that will be persisted until we
   // advance to the next frame.
   scoped_ptr<FrameData> cur_frame_data_;
 
   // Stores the intermediate data used to create features.  This data is
   // accumulated across all frames in the RenderView.
   scoped_ptr<PageFeatureState> page_feature_state_;
 
   // Used in scheduling ExtractFeaturesWithTimeout tasks.
   // These pointers are invalidated if extraction is cancelled.
   base::WeakPtrFactory<PhishingDOMFeatureExtractor> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PhishingDOMFeatureExtractor);
 };
 
 }  // namespace safe_browsing
 
 #endif  // CHROME_RENDERER_SAFE_BROWSING_PHISHING_DOM_FEATURE_EXTRACTOR_H_