Multi-Profiles: Initialize sync user name when adding profile

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 480 matching lines @@
 }
 
 void ProfileManager::AddProfileToCache(Profile* profile) {
   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));
+
   if (profile->GetPath() == GetDefaultProfileDir(cache.GetUserDataDir())) {
     cache.AddProfileToCache(
         profile->GetPath(),
-        l10n_util::GetStringUTF16(IDS_DEFAULT_PROFILE_NAME), 0);
+        l10n_util::GetStringUTF16(IDS_DEFAULT_PROFILE_NAME), username, 0);
   } else {
     cache.AddProfileToCache(
-        profile->GetPath(),
-        cache.ChooseNameForNewProfile(),
+        profile->GetPath(), cache.ChooseNameForNewProfile(), username,
         cache.ChooseAvatarIconIndexForNewProfile());
   }
 }
 
 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) ||
@@ skipping 27 matching lines @@
 ProfileManagerWithoutInit::ProfileManagerWithoutInit(
     const FilePath& user_data_dir) : ProfileManager(user_data_dir) {
 }
 
 void ProfileManager::RegisterTestingProfile(Profile* profile,
                                             bool add_to_cache) {
   RegisterProfile(profile, true);
   if (add_to_cache)
     AddProfileToCache(profile);
 }