| Index: chrome/browser/extensions/activity_log/activity_database_unittest.cc
|
| diff --git a/chrome/browser/extensions/activity_log/activity_database_unittest.cc b/chrome/browser/extensions/activity_log/activity_database_unittest.cc
|
| index 96089238031be926c15c7ec405d64a3ed256d462..62f948aacb1c793539b70ef4d5d606504586f50a 100644
|
| --- a/chrome/browser/extensions/activity_log/activity_database_unittest.cc
|
| +++ b/chrome/browser/extensions/activity_log/activity_database_unittest.cc
|
| @@ -166,7 +166,7 @@ class ActivityDatabaseTest : public ChromeRenderViewHostTestHarness {
|
| #if defined OS_CHROMEOS
|
| chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
|
| chromeos::ScopedTestCrosSettings test_cros_settings_;
|
| - scoped_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
|
| + std::unique_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
|
| #endif
|
|
|
| ActivityDatabaseTestPolicy* db_delegate_;
|
|
|