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

Unified Diff: chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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/chromeos/login/supervised/supervised_user_test_base.cc
diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc b/chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc
index be5e27ca9324f4e2ef4f2a8dad9df0735959cc3b..d35e1bfb9ecfa472cd4d1fababfd1404770a166e 100644
--- a/chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc
+++ b/chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc
@@ -63,15 +63,15 @@ SupervisedUsersSyncTestAdapter::SupervisedUsersSyncTestAdapter(Profile* profile)
service_ = SupervisedUserSyncServiceFactory::GetForProfile(profile);
processor_ = new syncer::FakeSyncChangeProcessor();
service_->MergeDataAndStartSyncing(
- syncer::SUPERVISED_USERS,
- syncer::SyncDataList(),
- scoped_ptr<syncer::SyncChangeProcessor>(processor_),
- scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock));
+ syncer::SUPERVISED_USERS, syncer::SyncDataList(),
+ std::unique_ptr<syncer::SyncChangeProcessor>(processor_),
+ std::unique_ptr<syncer::SyncErrorFactory>(
+ new syncer::SyncErrorFactoryMock));
}
-scoped_ptr< ::sync_pb::ManagedUserSpecifics>
+std::unique_ptr<::sync_pb::ManagedUserSpecifics>
SupervisedUsersSyncTestAdapter::GetFirstChange() {
- scoped_ptr< ::sync_pb::ManagedUserSpecifics> result(
+ std::unique_ptr<::sync_pb::ManagedUserSpecifics> result(
new ::sync_pb::ManagedUserSpecifics);
CHECK(HasChanges())
<< "GetFirstChange() should only be callled if HasChanges() is true";
@@ -112,15 +112,15 @@ SupervisedUsersSharedSettingsSyncTestAdapter::
SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext(profile);
processor_ = new syncer::FakeSyncChangeProcessor();
service_->MergeDataAndStartSyncing(
- syncer::SUPERVISED_USER_SHARED_SETTINGS,
- syncer::SyncDataList(),
- scoped_ptr<syncer::SyncChangeProcessor>(processor_),
- scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock));
+ syncer::SUPERVISED_USER_SHARED_SETTINGS, syncer::SyncDataList(),
+ std::unique_ptr<syncer::SyncChangeProcessor>(processor_),
+ std::unique_ptr<syncer::SyncErrorFactory>(
+ new syncer::SyncErrorFactoryMock));
}
-scoped_ptr< ::sync_pb::ManagedUserSharedSettingSpecifics>
+std::unique_ptr<::sync_pb::ManagedUserSharedSettingSpecifics>
SupervisedUsersSharedSettingsSyncTestAdapter::GetFirstChange() {
- scoped_ptr< ::sync_pb::ManagedUserSharedSettingSpecifics> result(
+ std::unique_ptr<::sync_pb::ManagedUserSharedSettingSpecifics> result(
new ::sync_pb::ManagedUserSharedSettingSpecifics);
CHECK(HasChanges())
<< "GetFirstChange() should only be callled if HasChanges() is true";

Powered by Google App Engine
This is Rietveld 408576698