Stop using the old-style profile names when using --new-profile-management

chrome/browser/ui/views/profile_chooser_view.cc

Index: chrome/browser/ui/views/profile_chooser_view.cc
diff --git a/chrome/browser/ui/views/profile_chooser_view.cc b/chrome/browser/ui/views/profile_chooser_view.cc
index efdd4b881d943042ce3be97e0dd4c70d64c6e84e..6444c2344b587bb38ce9d5a9befa094791a2149b 100644
--- a/chrome/browser/ui/views/profile_chooser_view.cc
+++ b/chrome/browser/ui/views/profile_chooser_view.cc
@@ -598,9 +598,8 @@ views::View* ProfileChooserView::CreateCurrentProfileView(
   current_profile_photo_ =
       new EditableProfilePhoto(this, avatar_item.icon, !is_guest);
   view->SetBoundsRect(current_profile_photo_->bounds());
-  current_profile_name_ =
-      new EditableProfileName(this, avatar_item.name, !is_guest);
-
+  current_profile_name_ = new EditableProfileName(
+      this, profiles::GetAvatarNameForProfile(browser_->profile()), !is_guest);
   layout->StartRow(1, 0);
   layout->AddView(current_profile_photo_, 1, 3);
   layout->AddView(current_profile_name_);
@@ -651,8 +650,8 @@ views::View* ProfileChooserView::CreateCurrentProfileEditableView(
   current_profile_photo_ =
       new EditableProfilePhoto(this, avatar_item.icon, true);
   view->SetBoundsRect(current_profile_photo_->bounds());
-  current_profile_name_ =
-      new EditableProfileName(this, avatar_item.name, true);
+  current_profile_name_ = new EditableProfileName(
+      this, profiles::GetAvatarNameForProfile(browser_->profile()), true);
 
   layout->StartRow(1, 0);
   layout->AddView(current_profile_photo_, 1, 3);