Restore avatar after user logs out from sync.

BUG=863008

Change-Id: If083bc0703e251fb6e9c597fe5b7f842e37875c9

R=bauerb@chromium.org,sky@chromium.org

Change-Id: If083bc0703e251fb6e9c597fe5b7f842e37875c9
Reviewed-on: https://chromium-review.googlesource.com/1135137
Commit-Queue: Thomas Tangl <tangltom@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Reviewed-by: Thomas Tangl <tangltom@chromium.org>
Reviewed-by: David Roger <droger@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582541}

chrome/browser/profiles/gaia_info_update_service.cc

@@ -164,6 +164,12 @@ void GAIAInfoUpdateService::OnUsernameChanged(const std::string& username) {
     entry->SetGAIAPicture(nullptr);
     // Unset the cached URL.
     profile_->GetPrefs()->ClearPref(prefs::kProfileGAIAInfoPictureURL);
+    if (profile_->GetPrefs()->GetInteger(prefs::kProfileLocalAvatarIndex) !=
+        -1) {
+      // Restore avatar from the local prefs.
+      entry->SetAvatarIconIndex(
+          profile_->GetPrefs()->GetInteger(prefs::kProfileLocalAvatarIndex));
+    }
   } else {
     // Update the new user's GAIA info.
     Update();

chrome/browser/profiles/gaia_info_update_service_unittest.cc

@@ -338,4 +338,27 @@ TEST_F(GAIAInfoUpdateServiceTest, LogIn) {
                               "pat@example.com");
 }
 
+TEST_F(GAIAInfoUpdateServiceTest, RestoreAvatarIndexOnLogout) {
+  identity::SetPrimaryAccount(SigninManagerFactory::GetForProfile(profile()),
+                              IdentityManagerFactory::GetForProfile(profile()),
+                              "pat@example.com");
+
+  const size_t kLocalAvatarIndex = 10;
+  const size_t kRemoteAvatarIndex = 5;
+
+  profile()->GetPrefs()->SetInteger(prefs::kProfileLocalAvatarIndex,
+                                    kLocalAvatarIndex);
+
+  ASSERT_EQ(1u, storage()->GetNumberOfProfiles());
+  ProfileAttributesEntry* entry = storage()->GetAllProfilesAttributes().front();
+  entry->SetAvatarIconIndex(kRemoteAvatarIndex);
+  EXPECT_EQ(kRemoteAvatarIndex, entry->GetAvatarIconIndex());
+
+  // Log out.
+  identity::ClearPrimaryAccount(
+      SigninManagerFactory::GetForProfile(profile()),
+      IdentityManagerFactory::GetForProfile(profile()));
+  EXPECT_EQ(kLocalAvatarIndex, entry->GetAvatarIconIndex());
+}
+
 #endif

chrome/browser/profiles/profile_impl.cc

@@ -396,6 +396,7 @@ void ProfileImpl::RegisterProfilePrefs(
   registry->RegisterStringPref(prefs::kProfileName, std::string(),
                                user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 #endif
+  registry->RegisterIntegerPref(prefs::kProfileLocalAvatarIndex, -1);
 
   registry->RegisterStringPref(prefs::kSupervisedUserId, std::string());
 #if defined(OS_ANDROID)

chrome/browser/profiles/profile_manager.cc

@@ -1055,6 +1055,11 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) {
   if (!profile->GetPrefs()->HasPrefPath(prefs::kProfileAvatarIndex))
     profile->GetPrefs()->SetInteger(prefs::kProfileAvatarIndex, avatar_index);
 
+  if (!profile->GetPrefs()->HasPrefPath(prefs::kProfileLocalAvatarIndex)) {
+    profile->GetPrefs()->SetInteger(prefs::kProfileLocalAvatarIndex,
+                                    avatar_index);
+  }
+
   if (!profile->GetPrefs()->HasPrefPath(prefs::kProfileName))
     profile->GetPrefs()->SetString(prefs::kProfileName, profile_name);
 

chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc

@@ -192,6 +192,7 @@ void ManageProfileHandler::HandleSetProfileIconToDefaultAvatar(
 
   PrefService* pref_service = profile_->GetPrefs();
   pref_service->SetInteger(prefs::kProfileAvatarIndex, new_icon_index);
+  pref_service->SetInteger(prefs::kProfileLocalAvatarIndex, new_icon_index);
   pref_service->SetBoolean(prefs::kProfileUsingDefaultAvatar, false);
   pref_service->SetBoolean(prefs::kProfileUsingGAIAAvatar, false);
 

chrome/common/pref_names.cc

@@ -1082,6 +1082,7 @@ const char kImportDialogSearchEngine[] = "import_dialog_search_engine";
 
 // Profile avatar and name
 const char kProfileAvatarIndex[] = "profile.avatar_index";
+const char kProfileLocalAvatarIndex[] = "profile.local_avatar_index";
 const char kProfileName[] = "profile.name";
 // Whether a profile is using a default avatar name (eg. Pickles or Person 1)
 // because it was randomly assigned at profile creation time.

chrome/common/pref_names.h

@@ -360,6 +360,7 @@ extern const char kImportDialogSavedPasswords[];
 extern const char kImportDialogSearchEngine[];
 
 extern const char kProfileAvatarIndex[];
+extern const char kProfileLocalAvatarIndex[];
 extern const char kProfileUsingDefaultName[];
 extern const char kProfileName[];
 extern const char kProfileUsingDefaultAvatar[];