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

chrome/renderer/safe_browsing/phishing_term_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.
 //
 // PhishingTermFeatureExtractor handles computing term features from the text
 // of a web page for the client-side phishing detection model.  To do this, it
 // takes a list of terms that appear in the model, and scans through the page
 // text looking for them.  Any terms that appear will cause a corresponding
 // features::kPageTerm feature to be added to the FeatureMap.
 //
 // To make it harder for a phisher to enumerate all of the relevant terms in
 // the model, the terms are provided as SHA-256 hashes, rather than plain text.
 //
 // There is one PhishingTermFeatureExtractor per RenderView.
 
 #ifndef CHROME_RENDERER_SAFE_BROWSING_PHISHING_TERM_FEATURE_EXTRACTOR_H_
 #define CHROME_RENDERER_SAFE_BROWSING_PHISHING_TERM_FEATURE_EXTRACTOR_H_
 
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/callback_old.h"
+#include "base/callback.h"
 #include "base/hash_tables.h"
 #include "base/memory/mru_cache.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_piece.h"
 #include "base/string16.h"
 #include "base/task.h"
 
 namespace safe_browsing {
 class FeatureExtractorClock;
 class FeatureMap;
 
 class PhishingTermFeatureExtractor {
  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 PhishingTermFeatureExtractor which will extract features for
   // all of the terms whose SHA-256 hashes are in |page_term_hashes|.  These
   // terms may be multi-word n-grams, with at most |max_words_per_term| words.
   //
   // |page_word_hashes| contains the murmur3 hashes for all of the individual
   // words that make up the terms.  Both sets of strings are UTF-8 encoded and
   // lowercased prior to hashing.  The caller owns both sets of strings, and
   // must ensure that they are valid until the PhishingTermFeatureExtractor is
   // destroyed.
@@ skipping 16 matching lines @@
   // 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.
   // PhishingTermFeatureExtractor takes ownership of the callback.
   //
   // |page_text| and |features| are owned by the caller, and must not be
   // destroyed until either |done_callback| is run or
   // CancelPendingExtraction() is called.
   void ExtractFeatures(const string16* page_text,
                        FeatureMap* features,
-                       DoneCallback* done_callback);
+                       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 PhishingTermFeatureExtractor is destroyed.
   void CancelPendingExtraction();
 
  private:
   struct ExtractionState;
 
   // The maximum amount of wall time that we will spend on a single extraction
@@ skipping 55 matching lines @@
   // an LRU cache (i.e. it evicts the oldest accesses first).
   typedef base::HashingMRUCache<base::StringPiece16, bool> WordCache;
   WordCache negative_word_cache_;
 
   // Non-owned pointer to our clock.
   FeatureExtractorClock* clock_;
 
   // The output parameters from the most recent call to ExtractFeatures().
   const string16* page_text_;  // The caller keeps ownership of this.
   FeatureMap* features_;  // The caller keeps ownership of this.
-  scoped_ptr<DoneCallback> done_callback_;
+  DoneCallback done_callback_;
 
   // Stores the current state of term extraction from |page_text_|.
   scoped_ptr<ExtractionState> state_;
 
   // Used in scheduling ExtractFeaturesWithTimeout tasks.
   // These pointers are invalidated if extraction is cancelled.
   base::WeakPtrFactory<PhishingTermFeatureExtractor> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PhishingTermFeatureExtractor);
 };
 
 }  // namespace safe_browsing
 
 #endif  // CHROME_RENDERER_SAFE_BROWSING_PHISHING_TERM_FEATURE_EXTRACTOR_H_