Avatar syncing for supervised users

chrome/browser/managed_mode/managed_user_registration_utility.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_registration_utility.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 89 matching lines @@
   std::string pending_managed_user_token_;
   bool pending_managed_user_acknowledged_;
   bool is_existing_managed_user_;
   RegistrationCallback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(ManagedUserRegistrationUtilityImpl);
 };
 
 } // namespace
 
-ManagedUserRegistrationInfo::ManagedUserRegistrationInfo(const string16& name)
-    : name(name) {
+ManagedUserRegistrationInfo::ManagedUserRegistrationInfo(const string16& name,
+                                                         int avatar_index)
+    : avatar_index(avatar_index),
+      name(name) {
 }
 
 ScopedTestingManagedUserRegistrationUtility::
     ScopedTestingManagedUserRegistrationUtility(
         ManagedUserRegistrationUtility* instance) {
   ManagedUserRegistrationUtility::SetUtilityForTests(instance);
 }
 
 ScopedTestingManagedUserRegistrationUtility::
     ~ScopedTestingManagedUserRegistrationUtility() {
@@ skipping 73 matching lines @@
     const RegistrationCallback& callback) {
   DCHECK(pending_managed_user_id_.empty());
   callback_ = callback;
   pending_managed_user_id_ = managed_user_id;
 
   const DictionaryValue* dict = prefs_->GetDictionary(prefs::kManagedUsers);
   is_existing_managed_user_ = dict->HasKey(managed_user_id);
   if (!is_existing_managed_user_) {
     managed_user_sync_service_->AddManagedUser(pending_managed_user_id_,
                                                base::UTF16ToUTF8(info.name),
-                                               info.master_key);
+                                               info.master_key,
+                                               info.avatar_index);
   } else {
     // User already exists, don't wait for acknowledgment.
     OnManagedUserAcknowledged(managed_user_id);
   }
 
   browser_sync::DeviceInfo::GetClientName(
       base::Bind(&ManagedUserRegistrationUtilityImpl::FetchToken,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
@@ skipping 75 matching lines @@
     DCHECK(success);
     managed_user_sync_service_->DeleteManagedUser(pending_managed_user_id_);
   }
 
   if (run_callback)
     callback_.Run(error, pending_managed_user_token_);
   callback_.Reset();
 }
 
 } // namespace