Index: chrome/browser/safe_browsing/browser_feature_extractor.h |
diff --git a/chrome/browser/safe_browsing/browser_feature_extractor.h b/chrome/browser/safe_browsing/browser_feature_extractor.h |
index bd44c4369c136ec4df12c717991cdca1f033de8c..42d6bfbfbfca12f11dd7e32ecf6f7565059db127 100644 |
--- a/chrome/browser/safe_browsing/browser_feature_extractor.h |
+++ b/chrome/browser/safe_browsing/browser_feature_extractor.h |
@@ -11,6 +11,7 @@ |
#define CHROME_BROWSER_SAFE_BROWSING_BROWSER_FEATURE_EXTRACTOR_H_ |
#include <map> |
+#include <memory> |
#include <set> |
#include <string> |
#include <utility> |
@@ -19,7 +20,6 @@ |
#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" |
@@ -69,7 +69,7 @@ struct BrowseInfo { |
// 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 |
@@ -95,9 +95,9 @@ class BrowserFeatureExtractor { |
// 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 |
@@ -134,12 +134,12 @@ class BrowserFeatureExtractor { |
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, |
@@ -147,7 +147,7 @@ class BrowserFeatureExtractor { |
// 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, |
@@ -155,7 +155,7 @@ class BrowserFeatureExtractor { |
// 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, |
@@ -176,9 +176,10 @@ class BrowserFeatureExtractor { |
// 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_; |