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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_ service.h" 5 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_ service.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 protected: 82 protected:
83 typedef base::CallbackList<void(const std::string&, const std::string&)> 83 typedef base::CallbackList<void(const std::string&, const std::string&)>
84 CallbackList; 84 CallbackList;
85 85
86 SupervisedUserSharedSettingsServiceTest() 86 SupervisedUserSharedSettingsServiceTest()
87 : settings_service_(profile_.GetPrefs()) {} 87 : settings_service_(profile_.GetPrefs()) {}
88 ~SupervisedUserSharedSettingsServiceTest() override {} 88 ~SupervisedUserSharedSettingsServiceTest() override {}
89 89
90 SyncMergeResult StartSyncing(const syncer::SyncDataList& initial_sync_data) { 90 SyncMergeResult StartSyncing(const syncer::SyncDataList& initial_sync_data) {
91 sync_processor_.reset(new syncer::FakeSyncChangeProcessor); 91 sync_processor_.reset(new syncer::FakeSyncChangeProcessor);
92 scoped_ptr<syncer::SyncErrorFactory> error_handler( 92 std::unique_ptr<syncer::SyncErrorFactory> error_handler(
93 new MockSyncErrorFactory(SUPERVISED_USER_SHARED_SETTINGS)); 93 new MockSyncErrorFactory(SUPERVISED_USER_SHARED_SETTINGS));
94 SyncMergeResult result = settings_service_.MergeDataAndStartSyncing( 94 SyncMergeResult result = settings_service_.MergeDataAndStartSyncing(
95 SUPERVISED_USER_SHARED_SETTINGS, initial_sync_data, 95 SUPERVISED_USER_SHARED_SETTINGS, initial_sync_data,
96 scoped_ptr<SyncChangeProcessor>( 96 std::unique_ptr<SyncChangeProcessor>(
97 new SyncChangeProcessorWrapperForTest(sync_processor_.get())), 97 new SyncChangeProcessorWrapperForTest(sync_processor_.get())),
98 std::move(error_handler)); 98 std::move(error_handler));
99 EXPECT_FALSE(result.error().IsSet()); 99 EXPECT_FALSE(result.error().IsSet());
100 return result; 100 return result;
101 } 101 }
102 102
103 const base::DictionaryValue* GetAllSettings() { 103 const base::DictionaryValue* GetAllSettings() {
104 return profile_.GetPrefs()->GetDictionary( 104 return profile_.GetPrefs()->GetDictionary(
105 prefs::kSupervisedUserSharedSettings); 105 prefs::kSupervisedUserSharedSettings);
106 } 106 }
(...skipping 25 matching lines...) Expand all
132 changed_settings_.push_back( 132 changed_settings_.push_back(
133 SupervisedUserSharedSettingsService::CreateSyncDataForSetting( 133 SupervisedUserSharedSettingsService::CreateSyncDataForSetting(
134 su_id, key, *value, true)); 134 su_id, key, *value, true));
135 } 135 }
136 136
137 content::TestBrowserThreadBundle thread_bundle_; 137 content::TestBrowserThreadBundle thread_bundle_;
138 TestingProfile profile_; 138 TestingProfile profile_;
139 SupervisedUserSharedSettingsService settings_service_; 139 SupervisedUserSharedSettingsService settings_service_;
140 SyncDataList changed_settings_; 140 SyncDataList changed_settings_;
141 141
142 scoped_ptr<CallbackList::Subscription> subscription_; 142 std::unique_ptr<CallbackList::Subscription> subscription_;
143 143
144 scoped_ptr<syncer::FakeSyncChangeProcessor> sync_processor_; 144 std::unique_ptr<syncer::FakeSyncChangeProcessor> sync_processor_;
145 }; 145 };
146 146
147 TEST_F(SupervisedUserSharedSettingsServiceTest, Empty) { 147 TEST_F(SupervisedUserSharedSettingsServiceTest, Empty) {
148 StartSyncing(SyncDataList()); 148 StartSyncing(SyncDataList());
149 EXPECT_EQ(0u, sync_processor_->changes().size()); 149 EXPECT_EQ(0u, sync_processor_->changes().size());
150 EXPECT_EQ(0u, changed_settings_.size()); 150 EXPECT_EQ(0u, changed_settings_.size());
151 EXPECT_EQ( 151 EXPECT_EQ(
152 0u, 152 0u,
153 settings_service_.GetAllSyncData(SUPERVISED_USER_SHARED_SETTINGS).size()); 153 settings_service_.GetAllSyncData(SUPERVISED_USER_SHARED_SETTINGS).size());
154 EXPECT_EQ(0u, GetAllSettings()->size()); 154 EXPECT_EQ(0u, GetAllSettings()->size());
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 settings_service_.GetAllSyncData(SUPERVISED_USER_SHARED_SETTINGS).size()); 280 settings_service_.GetAllSyncData(SUPERVISED_USER_SHARED_SETTINGS).size());
281 EXPECT_EQ(ToJson(&name), 281 EXPECT_EQ(ToJson(&name),
282 ToJson(settings_service_.GetValue(kIdA, "name"))); 282 ToJson(settings_service_.GetValue(kIdA, "name")));
283 EXPECT_EQ(ToJson(&age), ToJson(settings_service_.GetValue(kIdA, "age"))); 283 EXPECT_EQ(ToJson(&age), ToJson(settings_service_.GetValue(kIdA, "age")));
284 EXPECT_EQ(ToJson(&bar), ToJson(settings_service_.GetValue(kIdB, "foo"))); 284 EXPECT_EQ(ToJson(&bar), ToJson(settings_service_.GetValue(kIdB, "foo")));
285 EXPECT_EQ(ToJson(&blurp), ToJson(settings_service_.GetValue(kIdC, "baz"))); 285 EXPECT_EQ(ToJson(&blurp), ToJson(settings_service_.GetValue(kIdC, "baz")));
286 EXPECT_FALSE(settings_service_.GetValue(kIdA, "foo")); 286 EXPECT_FALSE(settings_service_.GetValue(kIdA, "foo"));
287 EXPECT_FALSE(settings_service_.GetValue(kIdB, "name")); 287 EXPECT_FALSE(settings_service_.GetValue(kIdB, "name"));
288 EXPECT_FALSE(settings_service_.GetValue(kIdC, "name")); 288 EXPECT_FALSE(settings_service_.GetValue(kIdC, "name"));
289 } 289 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698