Index: chrome/browser/extensions/activity_log/activity_log_policy.h |
diff --git a/chrome/browser/extensions/activity_log/activity_log_policy.h b/chrome/browser/extensions/activity_log/activity_log_policy.h |
index dff6d7ac3c9fe95fd26cf555a901aec3a1121b2f..997e34a2696b5d1ebdae3dc19a8ebf6c7b7bb56d 100644 |
--- a/chrome/browser/extensions/activity_log/activity_log_policy.h |
+++ b/chrome/browser/extensions/activity_log/activity_log_policy.h |
@@ -8,6 +8,7 @@ |
#include <stdint.h> |
#include <map> |
+#include <memory> |
#include <set> |
#include <string> |
#include <vector> |
@@ -16,7 +17,6 @@ |
#include "base/bind_helpers.h" |
#include "base/callback.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/values.h" |
#include "chrome/browser/extensions/activity_log/activity_actions.h" |
#include "chrome/browser/extensions/activity_log/activity_database.h" |
@@ -80,7 +80,7 @@ class ActivityLogPolicy { |
virtual void ProcessAction(scoped_refptr<Action> action) = 0; |
// For unit testing only. |
- void SetClockForTesting(scoped_ptr<base::Clock> clock); |
+ void SetClockForTesting(std::unique_ptr<base::Clock> clock); |
// A collection of methods that are useful for implementing policies. These |
// are all static methods; the ActivityLogPolicy::Util class cannot be |
@@ -144,7 +144,7 @@ class ActivityLogPolicy { |
// Support for a mock clock for testing purposes. This is used by ReadData |
// to determine the date for "today" when when interpreting date ranges to |
// fetch. This has no effect on batching of writes to the database. |
- scoped_ptr<base::Clock> testing_clock_; |
+ std::unique_ptr<base::Clock> testing_clock_; |
DISALLOW_COPY_AND_ASSIGN(ActivityLogPolicy); |
}; |
@@ -177,8 +177,8 @@ class ActivityLogDatabasePolicy : public ActivityLogPolicy, |
const std::string& page_url, |
const std::string& arg_url, |
const int days_ago, |
- const base::Callback |
- <void(scoped_ptr<Action::ActionVector>)>& callback) = 0; |
+ const base::Callback<void(std::unique_ptr<Action::ActionVector>)>& |
+ callback) = 0; |
// Remove actions (rows) which IDs are in the action_ids array. |
virtual void RemoveActions(const std::vector<int64_t>& action_ids) = 0; |