Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(737)

Unified Diff: chrome/browser/supervised_user/legacy/supervised_user_registration_utility_unittest.cc

Issue 1878143002: Convert //chrome/browser/supervised_user from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/supervised_user/legacy/supervised_user_registration_utility_unittest.cc
diff --git a/chrome/browser/supervised_user/legacy/supervised_user_registration_utility_unittest.cc b/chrome/browser/supervised_user/legacy/supervised_user_registration_utility_unittest.cc
index 647512fcdd73f892cd6d7f26988bbb3a3ee6c177..5a6b9e71cface72eed95c085354b25a33df5bae1 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_registration_utility_unittest.cc
+++ b/chrome/browser/supervised_user/legacy/supervised_user_registration_utility_unittest.cc
@@ -97,8 +97,8 @@ class SupervisedUserRegistrationUtilityTest : public ::testing::Test {
void TearDown() 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);
SyncMergeResult StartInitialSync();
@@ -130,7 +130,7 @@ class SupervisedUserRegistrationUtilityTest : public ::testing::Test {
TestingProfile profile_;
SupervisedUserSyncService* service_;
SupervisedUserSharedSettingsService* shared_settings_service_;
- scoped_ptr<SupervisedUserRegistrationUtility> registration_utility_;
+ std::unique_ptr<SupervisedUserRegistrationUtility> registration_utility_;
// Owned by the SupervisedUserSyncService.
MockChangeProcessor* change_processor_;
@@ -169,16 +169,16 @@ void SupervisedUserRegistrationUtilityTest::TearDown() {
content::RunAllBlockingPoolTasksUntilIdle();
}
-scoped_ptr<SyncChangeProcessor>
+std::unique_ptr<SyncChangeProcessor>
SupervisedUserRegistrationUtilityTest::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>
SupervisedUserRegistrationUtilityTest::CreateErrorFactory() {
- return scoped_ptr<SyncErrorFactory>(new syncer::SyncErrorFactoryMock());
+ return std::unique_ptr<SyncErrorFactory>(new syncer::SyncErrorFactoryMock());
}
SyncMergeResult SupervisedUserRegistrationUtilityTest::StartInitialSync() {
@@ -204,7 +204,7 @@ SupervisedUserRegistrationUtilityTest::GetRegistrationUtility() {
if (registration_utility_.get())
return registration_utility_.get();
- scoped_ptr<SupervisedUserRefreshTokenFetcher> token_fetcher(
+ std::unique_ptr<SupervisedUserRefreshTokenFetcher> token_fetcher(
new MockSupervisedUserRefreshTokenFetcher);
registration_utility_.reset(SupervisedUserRegistrationUtility::CreateImpl(
prefs(), std::move(token_fetcher), service(), shared_settings_service()));

Powered by Google App Engine
This is Rietveld 408576698