Convert //chrome/browser/safe_browsing from scoped_ptr to std::unique_ptr

chrome/browser/safe_browsing/browser_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.
 //
 // BrowserFeatureExtractor computes various browser features for client-side
 // phishing detection.  For now it does a bunch of lookups in the history
 // service to see whether a particular URL has been visited before by the
 // user.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_BROWSER_FEATURE_EXTRACTOR_H_
 #define CHROME_BROWSER_SAFE_BROWSING_BROWSER_FEATURE_EXTRACTOR_H_
 
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/safe_browsing/ui_manager.h"
 #include "components/history/core/browser/history_types.h"
 #include "content/public/common/resource_type.h"
 #include "url/gurl.h"
 
 
 namespace content {
@@ skipping 29 matching lines @@
 struct BrowseInfo {
   // The URL we're currently browsing.
   GURL url;
 
   // List of IPv4 and IPv6 addresses from which content was requested
   // together with the hosts on it, while browsing to the |url|.
   IPUrlMap ips;
 
   // If a SafeBrowsing interstitial was shown for the current URL
   // this will contain the UnsafeResource struct for that URL.
-  scoped_ptr<SafeBrowsingUIManager::UnsafeResource> unsafe_resource;
+  std::unique_ptr<SafeBrowsingUIManager::UnsafeResource> unsafe_resource;
 
   // List of redirects that lead to the first page on the current host and
   // the current url respectively. These may be the same if the current url
   // is the first page on its host.
   std::vector<GURL> host_redirects;
   std::vector<GURL> url_redirects;
 
   // URL of the referrer of this URL load.
   GURL referrer;
 
   // The HTTP status code from this navigation.
   int http_status_code;
 
   BrowseInfo();
   ~BrowseInfo();
 };
 
 // All methods of this class must be called on the UI thread (including
 // the constructor).
 class BrowserFeatureExtractor {
  public:
   // Called when feature extraction is done.  The first argument will be
   // true iff feature extraction succeeded.  The second argument is the
   // phishing request which was modified by the feature extractor.  The
   // DoneCallback takes ownership of the request object.
-  typedef base::Callback<void(bool, scoped_ptr<ClientPhishingRequest>)>
+  typedef base::Callback<void(bool, std::unique_ptr<ClientPhishingRequest>)>
       DoneCallback;
-  typedef base::Callback<void(bool, scoped_ptr<ClientMalwareRequest>)>
+  typedef base::Callback<void(bool, std::unique_ptr<ClientMalwareRequest>)>
       MalwareDoneCallback;
 
   // The caller keeps ownership of the tab and host objects and is
   // responsible for ensuring that they stay valid for the entire
   // lifetime of this object.
   BrowserFeatureExtractor(content::WebContents* tab,
                           ClientSideDetectionHost* host);
 
   // The destructor will cancel any pending requests.
   virtual ~BrowserFeatureExtractor();
@@ skipping 16 matching lines @@
   virtual void ExtractMalwareFeatures(BrowseInfo* info,
                                       ClientMalwareRequest* request,
                                       const MalwareDoneCallback& callback);
 
  private:
   // Synchronous browser feature extraction.
   void ExtractBrowseInfoFeatures(const BrowseInfo& info,
                                  ClientPhishingRequest* request);
 
   // Actually starts feature extraction (does the real work).
-  void StartExtractFeatures(scoped_ptr<ClientPhishingRequest> request,
+  void StartExtractFeatures(std::unique_ptr<ClientPhishingRequest> request,
                             const DoneCallback& callback);
 
   // HistoryService callback which is called when we're done querying URL visits
   // in the history.
-  void QueryUrlHistoryDone(scoped_ptr<ClientPhishingRequest> request,
+  void QueryUrlHistoryDone(std::unique_ptr<ClientPhishingRequest> request,
                            const DoneCallback& callback,
                            bool success,
                            const history::URLRow& row,
                            const history::VisitVector& visits);
 
   // HistoryService callback which is called when we're done querying HTTP host
   // visits in the history.
-  void QueryHttpHostVisitsDone(scoped_ptr<ClientPhishingRequest> request,
+  void QueryHttpHostVisitsDone(std::unique_ptr<ClientPhishingRequest> request,
                                const DoneCallback& callback,
                                bool success,
                                int num_visits,
                                base::Time first_visit);
 
   // HistoryService callback which is called when we're done querying HTTPS host
   // visits in the history.
-  void QueryHttpsHostVisitsDone(scoped_ptr<ClientPhishingRequest> request,
+  void QueryHttpsHostVisitsDone(std::unique_ptr<ClientPhishingRequest> request,
                                 const DoneCallback& callback,
                                 bool success,
                                 int num_visits,
                                 base::Time first_visit);
 
   // Helper function which sets the host history features given the
   // number of host visits and the time of the fist host visit.  Set
   // |is_http_query| to true if the URL scheme is HTTP and to false if
   // the scheme is HTTPS.
   void SetHostVisitsFeatures(int num_visits,
                              base::Time first_visit,
                              bool is_http_query,
                              ClientPhishingRequest* request);
 
   // Helper function which gets the history server if possible.  If the pointer
   // is set it will return true and false otherwise.
   bool GetHistoryService(history::HistoryService** history);
 
   // Helper function which is called when we're done filtering out benign IPs
   // on the IO thread.  This function is called on the UI thread.
-  void FinishExtractMalwareFeatures(scoped_ptr<IPUrlMap> bad_ips,
-                                    MalwareDoneCallback callback,
-                                    scoped_ptr<ClientMalwareRequest> request);
+  void FinishExtractMalwareFeatures(
+      std::unique_ptr<IPUrlMap> bad_ips,
+      MalwareDoneCallback callback,
+      std::unique_ptr<ClientMalwareRequest> request);
 
   content::WebContents* tab_;
   ClientSideDetectionHost* host_;
   base::CancelableTaskTracker cancelable_task_tracker_;
   base::WeakPtrFactory<BrowserFeatureExtractor> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserFeatureExtractor);
 };
 
 }  // namespace safe_browsing
 #endif  // CHROME_BROWSER_SAFE_BROWSING_BROWSER_FEATURE_EXTRACTOR_H_