Avatar syncing for supervised users

chrome/browser/managed_mode/managed_user_sync_service_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/managed_mode/managed_user_sync_service.h"
@@ skipping 56 matching lines @@
 }  // namespace
 
 class ManagedUserSyncServiceTest : public ::testing::Test {
  public:
   ManagedUserSyncServiceTest();
   virtual ~ManagedUserSyncServiceTest();
 
  protected:
   scoped_ptr<SyncChangeProcessor> CreateChangeProcessor();
   scoped_ptr<SyncErrorFactory> CreateErrorFactory();
-  SyncData CreateRemoteData(const std::string& id, const std::string& name);
+  SyncData CreateRemoteData(const std::string& id,
+                            const std::string& name,
+                            const std::string& avatar);
 
   SyncMergeResult StartInitialSync();
 
-  void Acknowledge();
   void ResetService();
 
   PrefService* prefs() { return profile_.GetPrefs(); }
   ManagedUserSyncService* service() { return service_; }
   MockChangeProcessor* change_processor() { return change_processor_; }
 
  private:
   TestingProfile profile_;
   ManagedUserSyncService* service_;
 
@@ skipping 19 matching lines @@
   return scoped_ptr<SyncChangeProcessor>(change_processor_);
 }
 
 scoped_ptr<SyncErrorFactory>
 ManagedUserSyncServiceTest::CreateErrorFactory() {
   return scoped_ptr<SyncErrorFactory>(new syncer::SyncErrorFactoryMock());
 }
 
 SyncData ManagedUserSyncServiceTest::CreateRemoteData(
     const std::string& id,
-    const std::string& name) {
+    const std::string& name,
+    const std::string& chrome_avatar) {
   ::sync_pb::EntitySpecifics specifics;
   specifics.mutable_managed_user()->set_id(id);
   specifics.mutable_managed_user()->set_name(name);
   specifics.mutable_managed_user()->set_acknowledged(true);
+  if (!chrome_avatar.empty())
+    specifics.mutable_managed_user()->set_chrome_avatar(chrome_avatar);
+
   return SyncData::CreateRemoteData(++sync_data_id_, specifics, base::Time());
 }
 
 SyncMergeResult ManagedUserSyncServiceTest::StartInitialSync() {
   SyncDataList initial_sync_data;
   SyncMergeResult result =
       service()->MergeDataAndStartSyncing(MANAGED_USERS,
                                           initial_sync_data,
                                           CreateChangeProcessor(),
                                           CreateErrorFactory());
@@ skipping 15 matching lines @@
   EXPECT_EQ(0, result.num_items_after_association());
   EXPECT_EQ(0u, prefs()->GetDictionary(prefs::kManagedUsers)->size());
   EXPECT_EQ(0u, change_processor()->changes().size());
 
   ResetService();
 }
 
 TEST_F(ManagedUserSyncServiceTest, MergeExisting) {
   const char kNameKey[] = "name";
   const char kAcknowledgedKey[] = "acknowledged";
+  const char kChromeAvatarKey[] = "chromeAvatar";
 
   const char kUserId1[] = "aaaaa";
   const char kUserId2[] = "bbbbb";
   const char kUserId3[] = "ccccc";
   const char kUserId4[] = "ddddd";
   const char kName1[] = "Anchor";
   const char kName2[] = "Buzz";
   const char kName3[] = "Crush";
   const char kName4[] = "Dory";
+  const char kAvatar1[] = "";
+  const char kAvatar2[] = "chrome-avatar-index:0";
+  const char kAvatar3[] = "chrome-avatar-index:20";
+  const char kAvatar4[] = "";
   {
     DictionaryPrefUpdate update(prefs(), prefs::kManagedUsers);
     DictionaryValue* managed_users = update.Get();
     DictionaryValue* dict = new DictionaryValue;
     dict->SetString(kNameKey, kName1);
     managed_users->Set(kUserId1, dict);
     dict = new DictionaryValue;
     dict->SetString(kNameKey, kName2);
     dict->SetBoolean(kAcknowledgedKey, true);
     managed_users->Set(kUserId2, dict);
   }
 
   SyncDataList initial_sync_data;
-  initial_sync_data.push_back(CreateRemoteData(kUserId2, kName2));
-  initial_sync_data.push_back(CreateRemoteData(kUserId3, kName3));
-  initial_sync_data.push_back(CreateRemoteData(kUserId4, kName4));
+  initial_sync_data.push_back(CreateRemoteData(kUserId2, kName2, kAvatar2));
+  initial_sync_data.push_back(CreateRemoteData(kUserId3, kName3, kAvatar3));
+  initial_sync_data.push_back(CreateRemoteData(kUserId4, kName4, kAvatar4));
 
   SyncMergeResult result =
       service()->MergeDataAndStartSyncing(MANAGED_USERS,
                                           initial_sync_data,
                                           CreateChangeProcessor(),
                                           CreateErrorFactory());
   EXPECT_FALSE(result.error().IsSet());
   EXPECT_EQ(2, result.num_items_added());
   EXPECT_EQ(1, result.num_items_modified());
   EXPECT_EQ(0, result.num_items_deleted());
   EXPECT_EQ(2, result.num_items_before_association());
   EXPECT_EQ(4, result.num_items_after_association());
 
   const DictionaryValue* managed_users =
       prefs()->GetDictionary(prefs::kManagedUsers);
   EXPECT_EQ(4u, managed_users->size());
   {
     const DictionaryValue* managed_user = NULL;
     ASSERT_TRUE(managed_users->GetDictionary(kUserId2, &managed_user));
     ASSERT_TRUE(managed_user);
     std::string name;
     EXPECT_TRUE(managed_user->GetString(kNameKey, &name));
     EXPECT_EQ(kName2, name);
     bool acknowledged = false;
     EXPECT_TRUE(managed_user->GetBoolean(kAcknowledgedKey, &acknowledged));
     EXPECT_TRUE(acknowledged);
+    std::string avatar;
+    EXPECT_TRUE(managed_user->GetString(kChromeAvatarKey, &avatar));
+    EXPECT_EQ(kAvatar2, avatar);
   }
   {
     const DictionaryValue* managed_user = NULL;
     ASSERT_TRUE(managed_users->GetDictionary(kUserId3, &managed_user));
     ASSERT_TRUE(managed_user);
     std::string name;
     EXPECT_TRUE(managed_user->GetString(kNameKey, &name));
     EXPECT_EQ(kName3, name);
     bool acknowledged = false;
     EXPECT_TRUE(managed_user->GetBoolean(kAcknowledgedKey, &acknowledged));
     EXPECT_TRUE(acknowledged);
+    std::string avatar;
+    EXPECT_TRUE(managed_user->GetString(kChromeAvatarKey, &avatar));
+    EXPECT_EQ(kAvatar3, avatar);
   }
   {
     const DictionaryValue* managed_user = NULL;
     ASSERT_TRUE(managed_users->GetDictionary(kUserId4, &managed_user));
     ASSERT_TRUE(managed_user);
     std::string name;
     EXPECT_TRUE(managed_user->GetString(kNameKey, &name));
     EXPECT_EQ(kName4, name);
     bool acknowledged = false;
     EXPECT_TRUE(managed_user->GetBoolean(kAcknowledgedKey, &acknowledged));
     EXPECT_TRUE(acknowledged);
+    std::string avatar;
+    EXPECT_TRUE(managed_user->GetString(kChromeAvatarKey, &avatar));
+    EXPECT_EQ(kAvatar4, avatar);
   }
 
   EXPECT_EQ(1u, change_processor()->changes().size());
   {
     SyncChange change = change_processor()->GetChange(kUserId1);
     ASSERT_TRUE(change.IsValid());
     EXPECT_EQ(SyncChange::ACTION_ADD, change.change_type());
     const ManagedUserSpecifics& managed_user =
         change.sync_data().GetSpecifics().managed_user();
     EXPECT_EQ(kName1, managed_user.name());
     EXPECT_FALSE(managed_user.acknowledged());
+    EXPECT_EQ(kAvatar1, managed_user.chrome_avatar());
   }
 }