[Profiles] Always use the placeholder avatar when creating new profiles.

This is to make the pre-new-avatar-menu world consistent with the
post-new-avatar-menu world.

BUG=NONE

Review URL: https://codereview.chromium.org/466733003

Cr-Commit-Position: refs/heads/master@{#289037}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289037 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/profiles/profile_manager.cc

@@ -777,11 +777,9 @@ void ProfileManager::InitProfileUserPrefs(Profile* profile) {
           cache.GetSupervisedUserIdOfProfileAtIndex(profile_cache_index);
     } else if (profile->GetPath() ==
                profiles::GetDefaultProfileDir(cache.GetUserDataDir())) {
-      // The --new-avatar-menu flag no longer uses the "First User" name,
-      // and should assign the default avatar icon to all new profiles.
+      // The --new-avatar-menu flag no longer uses the "First User" name.
       bool is_new_avatar_menu = switches::IsNewAvatarMenu();
-      avatar_index = is_new_avatar_menu ?
-          profiles::GetPlaceholderAvatarIndex() : 0;
+      avatar_index = profiles::GetPlaceholderAvatarIndex();
       profile_name = is_new_avatar_menu ?
           base::UTF16ToUTF8(cache.ChooseNameForNewProfile(avatar_index)) :
           l10n_util::GetStringUTF8(IDS_DEFAULT_PROFILE_NAME);