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

Side by Side Diff: chrome/browser/managed_mode/managed_user_sync_service_unittest.cc

Issue 104493005: Update some uses of Value in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <string> 5 #include <string>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/prefs/scoped_user_pref_update.h" 8 #include "base/prefs/scoped_user_pref_update.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "base/threading/sequenced_worker_pool.h" 10 #include "base/threading/sequenced_worker_pool.h"
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 #if defined(OS_CHROMEOS) 174 #if defined(OS_CHROMEOS)
175 const char kAvatar2[] = "chromeos-avatar-index:0"; 175 const char kAvatar2[] = "chromeos-avatar-index:0";
176 const char kAvatar3[] = "chromeos-avatar-index:20"; 176 const char kAvatar3[] = "chromeos-avatar-index:20";
177 #else 177 #else
178 const char kAvatar2[] = "chrome-avatar-index:0"; 178 const char kAvatar2[] = "chrome-avatar-index:0";
179 const char kAvatar3[] = "chrome-avatar-index:20"; 179 const char kAvatar3[] = "chrome-avatar-index:20";
180 #endif 180 #endif
181 const char kAvatar4[] = ""; 181 const char kAvatar4[] = "";
182 { 182 {
183 DictionaryPrefUpdate update(prefs(), prefs::kManagedUsers); 183 DictionaryPrefUpdate update(prefs(), prefs::kManagedUsers);
184 DictionaryValue* managed_users = update.Get(); 184 base::DictionaryValue* managed_users = update.Get();
185 DictionaryValue* dict = new DictionaryValue; 185 base::DictionaryValue* dict = new base::DictionaryValue;
186 dict->SetString(kNameKey, kName1); 186 dict->SetString(kNameKey, kName1);
187 managed_users->Set(kUserId1, dict); 187 managed_users->Set(kUserId1, dict);
188 dict = new DictionaryValue; 188 dict = new base::DictionaryValue;
189 dict->SetString(kNameKey, kName2); 189 dict->SetString(kNameKey, kName2);
190 dict->SetBoolean(kAcknowledgedKey, true); 190 dict->SetBoolean(kAcknowledgedKey, true);
191 managed_users->Set(kUserId2, dict); 191 managed_users->Set(kUserId2, dict);
192 } 192 }
193 193
194 const base::DictionaryValue* async_managed_users = NULL; 194 const base::DictionaryValue* async_managed_users = NULL;
195 service()->GetManagedUsersAsync( 195 service()->GetManagedUsersAsync(
196 base::Bind(&GetManagedUsersCallback, &async_managed_users)); 196 base::Bind(&GetManagedUsersCallback, &async_managed_users));
197 197
198 SyncDataList initial_sync_data; 198 SyncDataList initial_sync_data;
199 initial_sync_data.push_back(CreateRemoteData(kUserId2, kName2, kAvatar2)); 199 initial_sync_data.push_back(CreateRemoteData(kUserId2, kName2, kAvatar2));
200 initial_sync_data.push_back(CreateRemoteData(kUserId3, kName3, kAvatar3)); 200 initial_sync_data.push_back(CreateRemoteData(kUserId3, kName3, kAvatar3));
201 initial_sync_data.push_back(CreateRemoteData(kUserId4, kName4, kAvatar4)); 201 initial_sync_data.push_back(CreateRemoteData(kUserId4, kName4, kAvatar4));
202 202
203 SyncMergeResult result = 203 SyncMergeResult result =
204 service()->MergeDataAndStartSyncing(MANAGED_USERS, 204 service()->MergeDataAndStartSyncing(MANAGED_USERS,
205 initial_sync_data, 205 initial_sync_data,
206 CreateChangeProcessor(), 206 CreateChangeProcessor(),
207 CreateErrorFactory()); 207 CreateErrorFactory());
208 EXPECT_FALSE(result.error().IsSet()); 208 EXPECT_FALSE(result.error().IsSet());
209 EXPECT_EQ(2, result.num_items_added()); 209 EXPECT_EQ(2, result.num_items_added());
210 EXPECT_EQ(1, result.num_items_modified()); 210 EXPECT_EQ(1, result.num_items_modified());
211 EXPECT_EQ(0, result.num_items_deleted()); 211 EXPECT_EQ(0, result.num_items_deleted());
212 EXPECT_EQ(2, result.num_items_before_association()); 212 EXPECT_EQ(2, result.num_items_before_association());
213 EXPECT_EQ(4, result.num_items_after_association()); 213 EXPECT_EQ(4, result.num_items_after_association());
214 214
215 const DictionaryValue* managed_users = service()->GetManagedUsers(); 215 const base::DictionaryValue* managed_users = service()->GetManagedUsers();
216 EXPECT_EQ(4u, managed_users->size()); 216 EXPECT_EQ(4u, managed_users->size());
217 EXPECT_TRUE(async_managed_users); 217 EXPECT_TRUE(async_managed_users);
218 EXPECT_TRUE(managed_users->Equals(async_managed_users)); 218 EXPECT_TRUE(managed_users->Equals(async_managed_users));
219 219
220 { 220 {
221 const DictionaryValue* managed_user = NULL; 221 const base::DictionaryValue* managed_user = NULL;
222 ASSERT_TRUE(managed_users->GetDictionary(kUserId2, &managed_user)); 222 ASSERT_TRUE(managed_users->GetDictionary(kUserId2, &managed_user));
223 ASSERT_TRUE(managed_user); 223 ASSERT_TRUE(managed_user);
224 std::string name; 224 std::string name;
225 EXPECT_TRUE(managed_user->GetString(kNameKey, &name)); 225 EXPECT_TRUE(managed_user->GetString(kNameKey, &name));
226 EXPECT_EQ(kName2, name); 226 EXPECT_EQ(kName2, name);
227 bool acknowledged = false; 227 bool acknowledged = false;
228 EXPECT_TRUE(managed_user->GetBoolean(kAcknowledgedKey, &acknowledged)); 228 EXPECT_TRUE(managed_user->GetBoolean(kAcknowledgedKey, &acknowledged));
229 EXPECT_TRUE(acknowledged); 229 EXPECT_TRUE(acknowledged);
230 std::string avatar; 230 std::string avatar;
231 EXPECT_TRUE(managed_user->GetString(kChromeAvatarKey, &avatar)); 231 EXPECT_TRUE(managed_user->GetString(kChromeAvatarKey, &avatar));
232 EXPECT_EQ(kAvatar2, avatar); 232 EXPECT_EQ(kAvatar2, avatar);
233 } 233 }
234 { 234 {
235 const DictionaryValue* managed_user = NULL; 235 const base::DictionaryValue* managed_user = NULL;
236 ASSERT_TRUE(managed_users->GetDictionary(kUserId3, &managed_user)); 236 ASSERT_TRUE(managed_users->GetDictionary(kUserId3, &managed_user));
237 ASSERT_TRUE(managed_user); 237 ASSERT_TRUE(managed_user);
238 std::string name; 238 std::string name;
239 EXPECT_TRUE(managed_user->GetString(kNameKey, &name)); 239 EXPECT_TRUE(managed_user->GetString(kNameKey, &name));
240 EXPECT_EQ(kName3, name); 240 EXPECT_EQ(kName3, name);
241 bool acknowledged = false; 241 bool acknowledged = false;
242 EXPECT_TRUE(managed_user->GetBoolean(kAcknowledgedKey, &acknowledged)); 242 EXPECT_TRUE(managed_user->GetBoolean(kAcknowledgedKey, &acknowledged));
243 EXPECT_TRUE(acknowledged); 243 EXPECT_TRUE(acknowledged);
244 std::string avatar; 244 std::string avatar;
245 EXPECT_TRUE(managed_user->GetString(kChromeAvatarKey, &avatar)); 245 EXPECT_TRUE(managed_user->GetString(kChromeAvatarKey, &avatar));
246 EXPECT_EQ(kAvatar3, avatar); 246 EXPECT_EQ(kAvatar3, avatar);
247 } 247 }
248 { 248 {
249 const DictionaryValue* managed_user = NULL; 249 const base::DictionaryValue* managed_user = NULL;
250 ASSERT_TRUE(managed_users->GetDictionary(kUserId4, &managed_user)); 250 ASSERT_TRUE(managed_users->GetDictionary(kUserId4, &managed_user));
251 ASSERT_TRUE(managed_user); 251 ASSERT_TRUE(managed_user);
252 std::string name; 252 std::string name;
253 EXPECT_TRUE(managed_user->GetString(kNameKey, &name)); 253 EXPECT_TRUE(managed_user->GetString(kNameKey, &name));
254 EXPECT_EQ(kName4, name); 254 EXPECT_EQ(kName4, name);
255 bool acknowledged = false; 255 bool acknowledged = false;
256 EXPECT_TRUE(managed_user->GetBoolean(kAcknowledgedKey, &acknowledged)); 256 EXPECT_TRUE(managed_user->GetBoolean(kAcknowledgedKey, &acknowledged));
257 EXPECT_TRUE(acknowledged); 257 EXPECT_TRUE(acknowledged);
258 std::string avatar; 258 std::string avatar;
259 EXPECT_TRUE(managed_user->GetString(kChromeAvatarKey, &avatar)); 259 EXPECT_TRUE(managed_user->GetString(kChromeAvatarKey, &avatar));
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 EXPECT_FALSE(ManagedUserSyncService::GetAvatarIndex("chrome-avatar-index:", 324 EXPECT_FALSE(ManagedUserSyncService::GetAvatarIndex("chrome-avatar-index:",
325 &avatar)); 325 &avatar));
326 326
327 EXPECT_FALSE(ManagedUserSyncService::GetAvatarIndex("chrome-avatar-index:x", 327 EXPECT_FALSE(ManagedUserSyncService::GetAvatarIndex("chrome-avatar-index:x",
328 &avatar)); 328 &avatar));
329 329
330 EXPECT_FALSE(ManagedUserSyncService::GetAvatarIndex("chromeos-avatar-index:5", 330 EXPECT_FALSE(ManagedUserSyncService::GetAvatarIndex("chromeos-avatar-index:5",
331 &avatar)); 331 &avatar));
332 #endif 332 #endif
333 } 333 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698