Fix issues with supervised user recreation

chrome/browser/managed_mode/managed_user_sync_service.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 "chrome/browser/managed_mode/managed_user_sync_service.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 34 matching lines @@
                              const std::string& name,
                              bool acknowledged,
                              const std::string& master_key,
                              const std::string& chrome_avatar,
                              const std::string& chromeos_avatar) {
   ::sync_pb::EntitySpecifics specifics;
   specifics.mutable_managed_user()->set_id(id);
   specifics.mutable_managed_user()->set_name(name);
   if (!chrome_avatar.empty())
     specifics.mutable_managed_user()->set_chrome_avatar(chrome_avatar);
-  else
-    specifics.mutable_managed_user()->clear_chrome_avatar();
   if (!chromeos_avatar.empty())
     specifics.mutable_managed_user()->set_chromeos_avatar(chromeos_avatar);
   if (!master_key.empty())
     specifics.mutable_managed_user()->set_master_key(master_key);
   if (acknowledged)
     specifics.mutable_managed_user()->set_acknowledged(true);
   return SyncData::CreateLocalData(id, name, specifics);
 }
 
 SyncData CreateSyncDataFromDictionaryEntry(
@@ skipping 41 matching lines @@
 // static
 void ManagedUserSyncService::RegisterProfilePrefs(
     PrefRegistrySyncable* registry) {
   registry->RegisterDictionaryPref(prefs::kManagedUsers,
                                    PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 // static
 bool ManagedUserSyncService::GetAvatarIndex(const std::string& avatar_str,
                                             int* avatar_index) {
-  // TODO(ibraaaa): when chrome OS supports supervised users avatar syncing
-  // then update this method to support extracting the avatar index
-  // for chrome OS as well.
   DCHECK(avatar_index);
   if (avatar_str.empty()) {
     *avatar_index = kNoAvatar;
     return true;
   }
 #if defined(OS_CHROMEOS)
   const char* prefix = kChromeOSAvatarPrefix;
 #else
   const char* prefix = kChromeAvatarPrefix;
 #endif
@@ skipping 94 matching lines @@
   DictionaryValue* value = NULL;
   bool success = dict->GetDictionaryWithoutPathExpansion(id, &value);
   DCHECK(success);
 
   bool acknowledged = false;
   value->GetBoolean(ManagedUserSyncService::kAcknowledged, &acknowledged);
   std::string name;
   value->GetString(ManagedUserSyncService::kName, &name);
   std::string master_key;
   value->GetString(ManagedUserSyncService::kMasterKey, &master_key);
-  // TODO(ibraaaa): this should be updated when avatar syncing for
-  // supervised users is implemented on Chrome OS.
   std::string chromeos_avatar;
   value->GetString(ManagedUserSyncService::kChromeOsAvatar, &chromeos_avatar);
   std::string chrome_avatar;
   value->GetString(ManagedUserSyncService::kChromeAvatar, &chrome_avatar);
+  // The following check is just for safety. We want to avoid that the existing
+  // avatar selection is overwritten. Currently we don't allow the user to
+  // choose a different avatar in the recreation dialog, anyway, if there is
+  // already an avatar selected.
+#if defined(OS_CHROMEOS)
+  if (!chromeos_avatar.empty() && avatar_index != kNoAvatar)
+    return false;
+#else
   if (!chrome_avatar.empty() && avatar_index != kNoAvatar)
     return false;
+#endif
 
   chrome_avatar = avatar_index == kNoAvatar ?
       std::string() : BuildAvatarString(avatar_index);
+#if defined(OS_CHROMEOS)
+  value->SetString(kChromeOsAvatar, chrome_avatar);
+#else
   value->SetString(kChromeAvatar, chrome_avatar);
+#endif
 
   if (!sync_processor_)
     return true;
 
   SyncChangeList change_list;
   change_list.push_back(SyncChange(
       FROM_HERE,
       SyncChange::ACTION_UPDATE,
       CreateLocalSyncData(id, name, acknowledged, master_key,
                           chrome_avatar, chromeos_avatar)));
@@ skipping 174 matching lines @@
 
 void ManagedUserSyncService::DispatchCallbacks() {
   const DictionaryValue* managed_users =
       prefs_->GetDictionary(prefs::kManagedUsers);
   for (std::vector<ManagedUsersCallback>::iterator it = callbacks_.begin();
        it != callbacks_.end(); ++it) {
     it->Run(managed_users);
   }
   callbacks_.clear();
 }