| Index: chrome/browser/chromeos/status/data_promo_notification_unittest.cc
|
| diff --git a/chrome/browser/chromeos/status/data_promo_notification_unittest.cc b/chrome/browser/chromeos/status/data_promo_notification_unittest.cc
|
| index 29e866cb2cd4d5bbb6bcbbd36d215d450ec1bb7b..96fdffb02c0f8b1db48b154c120f37ec165e7b6c 100644
|
| --- a/chrome/browser/chromeos/status/data_promo_notification_unittest.cc
|
| +++ b/chrome/browser/chromeos/status/data_promo_notification_unittest.cc
|
| @@ -86,7 +86,8 @@ class DataPromoNotificationTest : public testing::Test {
|
|
|
| protected:
|
| void SetupUser() {
|
| - scoped_ptr<FakeChromeUserManager> user_manager(new FakeChromeUserManager());
|
| + std::unique_ptr<FakeChromeUserManager> user_manager(
|
| + new FakeChromeUserManager());
|
| const AccountId test_account_id(AccountId::FromUserEmail(kTestUserName));
|
| user_manager->AddUser(test_account_id);
|
| user_manager->LoginUser(test_account_id);
|
| @@ -134,10 +135,10 @@ class DataPromoNotificationTest : public testing::Test {
|
| base::FundamentalValue(true));
|
| }
|
|
|
| - scoped_ptr<DataPromoNotification> data_promo_notification_;
|
| - scoped_ptr<NetworkConnectTestDelegate> network_connect_delegate_;
|
| - scoped_ptr<ScopedUserManagerEnabler> user_manager_enabler_;
|
| - scoped_ptr<TestingProfileManager> profile_manager_;
|
| + std::unique_ptr<DataPromoNotification> data_promo_notification_;
|
| + std::unique_ptr<NetworkConnectTestDelegate> network_connect_delegate_;
|
| + std::unique_ptr<ScopedUserManagerEnabler> user_manager_enabler_;
|
| + std::unique_ptr<TestingProfileManager> profile_manager_;
|
| base::MessageLoop message_loop_;
|
|
|
| private:
|
|
|