| Index: chrome/browser/extensions/activity_log/activity_log_policy.cc
|
| diff --git a/chrome/browser/extensions/activity_log/activity_log_policy.cc b/chrome/browser/extensions/activity_log/activity_log_policy.cc
|
| index 99ef17c8e7de898296b51aad610b821ade0d84bd..0d39f9cfb03d8deceea163c190898b7aa2af27f1 100644
|
| --- a/chrome/browser/extensions/activity_log/activity_log_policy.cc
|
| +++ b/chrome/browser/extensions/activity_log/activity_log_policy.cc
|
| @@ -38,7 +38,7 @@ ActivityLogPolicy::ActivityLogPolicy(Profile* profile) {}
|
|
|
| ActivityLogPolicy::~ActivityLogPolicy() {}
|
|
|
| -void ActivityLogPolicy::SetClockForTesting(scoped_ptr<base::Clock> clock) {
|
| +void ActivityLogPolicy::SetClockForTesting(std::unique_ptr<base::Clock> clock) {
|
| testing_clock_.reset(clock.release());
|
| }
|
|
|
| @@ -134,7 +134,7 @@ void ActivityLogPolicy::Util::StripArguments(const ApiSet& api_whitelist,
|
| if (api_whitelist.find(
|
| std::make_pair(action->action_type(), action->api_name())) ==
|
| api_whitelist.end()) {
|
| - action->set_args(scoped_ptr<base::ListValue>());
|
| + action->set_args(std::unique_ptr<base::ListValue>());
|
| }
|
| }
|
|
|
|
|