Update managed user registration to allow updating the avatar

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 253 matching lines @@
         change.sync_data().GetSpecifics().managed_user();
     EXPECT_EQ(kName1, managed_user.name());
     EXPECT_FALSE(managed_user.acknowledged());
     EXPECT_EQ(kAvatar1, managed_user.chrome_avatar());
   }
 }
 
 TEST_F(ManagedUserSyncServiceTest, GetAvatarIndex) {
   int avatar = 100;
   EXPECT_TRUE(ManagedUserSyncService::GetAvatarIndex(std::string(), &avatar));
-  EXPECT_EQ(-1, avatar);
+  EXPECT_EQ(ManagedUserSyncService::kNoAvatar, avatar);
 
   std::string avatar_str = ManagedUserSyncService::BuildAvatarString(24);
   EXPECT_EQ("chrome-avatar-index:24", avatar_str);
   EXPECT_TRUE(ManagedUserSyncService::GetAvatarIndex(avatar_str, &avatar));
   EXPECT_EQ(24, avatar);
 
   avatar_str = ManagedUserSyncService::BuildAvatarString(0);
   EXPECT_EQ("chrome-avatar-index:0", avatar_str);
   EXPECT_TRUE(ManagedUserSyncService::GetAvatarIndex(avatar_str, &avatar));
   EXPECT_EQ(0, avatar);
 
   EXPECT_FALSE(ManagedUserSyncService::GetAvatarIndex("wrong-prefix:5",
                                                       &avatar));
 
   EXPECT_FALSE(ManagedUserSyncService::GetAvatarIndex("chrome-avatar-indes:2",
                                                       &avatar));
 
   EXPECT_FALSE(ManagedUserSyncService::GetAvatarIndex("chrome-avatar-indexxx:2",
                                                       &avatar));
 
   EXPECT_FALSE(ManagedUserSyncService::GetAvatarIndex("chrome-avatar-index:",
                                                       &avatar));
 
   EXPECT_FALSE(ManagedUserSyncService::GetAvatarIndex("chrome-avatar-index:x",
                                                       &avatar));
 }