| Index: chrome/browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc
|
| diff --git a/chrome/browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc b/chrome/browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc
|
| index 1bb7a8302d69037003cc31d64cc75f1cdffdc481..2f04ad248a4474b79d5f5bc78f60bf3dbec17876 100644
|
| --- a/chrome/browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc
|
| +++ b/chrome/browser/supervised_user/legacy/supervised_user_sync_service_unittest.cc
|
| @@ -90,8 +90,8 @@ class SupervisedUserSyncServiceTest : public ::testing::Test {
|
| ~SupervisedUserSyncServiceTest() override;
|
|
|
| protected:
|
| - scoped_ptr<SyncChangeProcessor> CreateChangeProcessor();
|
| - scoped_ptr<SyncErrorFactory> CreateErrorFactory();
|
| + std::unique_ptr<SyncChangeProcessor> CreateChangeProcessor();
|
| + std::unique_ptr<SyncErrorFactory> CreateErrorFactory();
|
| SyncData CreateRemoteData(const std::string& id,
|
| const std::string& name,
|
| const std::string& avatar);
|
| @@ -120,16 +120,16 @@ SupervisedUserSyncServiceTest::SupervisedUserSyncServiceTest()
|
|
|
| SupervisedUserSyncServiceTest::~SupervisedUserSyncServiceTest() {}
|
|
|
| -scoped_ptr<SyncChangeProcessor>
|
| +std::unique_ptr<SyncChangeProcessor>
|
| SupervisedUserSyncServiceTest::CreateChangeProcessor() {
|
| EXPECT_FALSE(change_processor_);
|
| change_processor_ = new MockChangeProcessor();
|
| - return scoped_ptr<SyncChangeProcessor>(change_processor_);
|
| + return std::unique_ptr<SyncChangeProcessor>(change_processor_);
|
| }
|
|
|
| -scoped_ptr<SyncErrorFactory>
|
| +std::unique_ptr<SyncErrorFactory>
|
| SupervisedUserSyncServiceTest::CreateErrorFactory() {
|
| - return scoped_ptr<SyncErrorFactory>(new syncer::SyncErrorFactoryMock());
|
| + return std::unique_ptr<SyncErrorFactory>(new syncer::SyncErrorFactoryMock());
|
| }
|
|
|
| SyncData SupervisedUserSyncServiceTest::CreateRemoteData(
|
|
|