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

Unified Diff: chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_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_shared_settings_service_unittest.cc
diff --git a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc
index 4ff71196e246ace9ded5d3866455d8257befcc5d..9c0acbdc2675969286d219c9a50f95dd90161865 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc
+++ b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc
@@ -89,11 +89,11 @@ class SupervisedUserSharedSettingsServiceTest : public ::testing::Test {
SyncMergeResult StartSyncing(const syncer::SyncDataList& initial_sync_data) {
sync_processor_.reset(new syncer::FakeSyncChangeProcessor);
- scoped_ptr<syncer::SyncErrorFactory> error_handler(
+ std::unique_ptr<syncer::SyncErrorFactory> error_handler(
new MockSyncErrorFactory(SUPERVISED_USER_SHARED_SETTINGS));
SyncMergeResult result = settings_service_.MergeDataAndStartSyncing(
SUPERVISED_USER_SHARED_SETTINGS, initial_sync_data,
- scoped_ptr<SyncChangeProcessor>(
+ std::unique_ptr<SyncChangeProcessor>(
new SyncChangeProcessorWrapperForTest(sync_processor_.get())),
std::move(error_handler));
EXPECT_FALSE(result.error().IsSet());
@@ -139,9 +139,9 @@ class SupervisedUserSharedSettingsServiceTest : public ::testing::Test {
SupervisedUserSharedSettingsService settings_service_;
SyncDataList changed_settings_;
- scoped_ptr<CallbackList::Subscription> subscription_;
+ std::unique_ptr<CallbackList::Subscription> subscription_;
- scoped_ptr<syncer::FakeSyncChangeProcessor> sync_processor_;
+ std::unique_ptr<syncer::FakeSyncChangeProcessor> sync_processor_;
};
TEST_F(SupervisedUserSharedSettingsServiceTest, Empty) {

Powered by Google App Engine
This is Rietveld 408576698