Lands http://codereview.chromium.org/8801034/ in hopes of getting a

chrome/browser/profiles/profile_manager.cc

 // Copyright (c) 2011 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 <set>
 
 #include "chrome/browser/profiles/profile_manager.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 39 matching lines @@
 using content::BrowserThread;
 
 namespace {
 
 // Profiles that should be deleted on shutdown.
 std::vector<FilePath>& ProfilesToDelete() {
   CR_DEFINE_STATIC_LOCAL(std::vector<FilePath>, profiles_to_delete, ());
   return profiles_to_delete;
 }
 
-// Checks if any user prefs for |profile| have default values.
-bool HasAnyDefaultUserPrefs(Profile* profile) {
-  const PrefService::Preference* avatar_index =
-      profile->GetPrefs()->FindPreference(prefs::kProfileAvatarIndex);
-  DCHECK(avatar_index);
-  const PrefService::Preference* profile_name =
-    profile->GetPrefs()->FindPreference(prefs::kProfileName);
-  DCHECK(profile_name);
-  return avatar_index->IsDefaultValue() ||
-         profile_name->IsDefaultValue();
-}
-
 // Simple task to log the size of the current profile.
 class ProfileSizeTask : public Task {
  public:
   explicit ProfileSizeTask(Profile* profile);
   virtual ~ProfileSizeTask() {}
 
   virtual void Run();
  private:
   FilePath path_;
   int extension_count_;
@@ skipping 392 matching lines @@
   DCHECK(local_state);
   // Only keep track of profiles that we are managing; tests may create others.
   if (profiles_info_.find(last_active->GetPath()) != profiles_info_.end()) {
     local_state->SetString(prefs::kProfileLastUsed,
                            last_active->GetPath().BaseName().MaybeAsASCII());
   }
 }
 
 void ProfileManager::DoFinalInit(Profile* profile, bool go_off_the_record) {
   DoFinalInitForServices(profile, go_off_the_record);
-  InitProfileUserPrefs(profile);
   AddProfileToCache(profile);
   DoFinalInitLogging(profile);
 }
 
 void ProfileManager::DoFinalInitForServices(Profile* profile,
                                          bool go_off_the_record) {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   profile->InitExtensions(!go_off_the_record);
   if (!command_line.HasSwitch(switches::kDisableWebResources))
     profile->InitPromoResources();
@@ skipping 131 matching lines @@
   ProfileInfoCache& cache = GetProfileInfoCache();
   if (profile->GetPath().DirName() != cache.GetUserDataDir())
     return;
 
   if (cache.GetIndexOfProfileWithPath(profile->GetPath()) != std::string::npos)
     return;
 
   string16 username = UTF8ToUTF16(profile->GetPrefs()->GetString(
       prefs::kGoogleServicesUsername));
 
-  // Profile name and avatar are set by InitProfileUserPrefs and stored in the
-  // profile. Use those values to setup the cache entry.
-  string16 profile_name = UTF8ToUTF16(profile->GetPrefs()->GetString(
-      prefs::kProfileName));
-
-  size_t icon_index = profile->GetPrefs()->GetInteger(
-      prefs::kProfileAvatarIndex);
-
-  cache.AddProfileToCache(profile->GetPath(),
-                          profile_name,
-                          username,
-                          icon_index);
-}
-
-void ProfileManager::InitProfileUserPrefs(Profile* profile) {
-  ProfileInfoCache& cache = GetProfileInfoCache();
-
-  if (profile->GetPath().DirName() != cache.GetUserDataDir())
-    return;
-
-  // Initialize the user preferences (name and avatar) only if the profile
-  // doesn't have default preferenc values for them.
-  if (HasAnyDefaultUserPrefs(profile)) {
-    size_t profile_cache_index =
-        cache.GetIndexOfProfileWithPath(profile->GetPath());
-    // If the cache has an entry for this profile, use the cache data
-    if (profile_cache_index != std::string::npos) {
-      profile->GetPrefs()->SetInteger(prefs::kProfileAvatarIndex,
-          cache.GetAvatarIconIndexOfProfileAtIndex(profile_cache_index));
-      profile->GetPrefs()->SetString(prefs::kProfileName,
-          UTF16ToUTF8(cache.GetNameOfProfileAtIndex(profile_cache_index)));
-    } else if (profile->GetPath() ==
-               GetDefaultProfileDir(cache.GetUserDataDir())) {
-      profile->GetPrefs()->SetInteger(prefs::kProfileAvatarIndex, 0);
-      profile->GetPrefs()->SetString(prefs::kProfileName,
-          l10n_util::GetStringUTF8(IDS_DEFAULT_PROFILE_NAME));
-    } else {
-      size_t icon_index = cache.ChooseAvatarIconIndexForNewProfile();
-      profile->GetPrefs()->SetInteger(prefs::kProfileAvatarIndex, icon_index);
-      profile->GetPrefs()->SetString(
-          prefs::kProfileName,
-          UTF16ToUTF8(cache.ChooseNameForNewProfile(icon_index)));
-    }
+  if (profile->GetPath() == GetDefaultProfileDir(cache.GetUserDataDir())) {
+    cache.AddProfileToCache(
+        profile->GetPath(),
+        l10n_util::GetStringUTF16(IDS_DEFAULT_PROFILE_NAME), username, 0);
+  } else {
+    size_t icon_index = cache.ChooseAvatarIconIndexForNewProfile();
+    cache.AddProfileToCache(profile->GetPath(),
+                            cache.ChooseNameForNewProfile(icon_index),
+                            username,
+                            icon_index);
   }
 }
 
 bool ProfileManager::ShouldGoOffTheRecord() {
   bool go_off_the_record = false;
 #if defined(OS_CHROMEOS)
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (!logged_in_ &&
       (!command_line.HasSwitch(switches::kTestType) ||
        command_line.HasSwitch(switches::kLoginProfile))) {
@@ skipping 76 matching lines @@
   RegisterProfile(profile, true);
   if (add_to_cache)
     AddProfileToCache(profile);
 }
 
 #if defined(OS_WIN)
 void ProfileManager::RemoveProfileShortcutManagerForTesting() {
   profile_info_cache_->RemoveObserver(profile_shortcut_manager_.get());
 }
 #endif