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

chrome/browser/ui/views/profile_chooser_view.cc

 // Copyright 2013 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 "chrome/browser/ui/views/profile_chooser_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_info_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ skipping 580 matching lines @@
   views::View* view = new views::View();
   views::GridLayout* layout = CreateDoubleColumnLayout(view);
   layout->SetInsets(views::kButtonVEdgeMarginNew,
                     views::kButtonHEdgeMarginNew,
                     views::kButtonVEdgeMarginNew,
                     views::kButtonHEdgeMarginNew);
 
   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_);
 
   if (is_guest) {
     layout->StartRow(1, 0);
     layout->SkipColumns(1);
     layout->StartRow(1, 0);
     layout->SkipColumns(1);
   } else if (avatar_item.signed_in) {
@@ skipping 30 matching lines @@
   views::View* view = new views::View();
   views::GridLayout* layout = CreateDoubleColumnLayout(view);
   layout->SetInsets(views::kButtonVEdgeMarginNew,
                     views::kButtonHEdgeMarginNew,
                     views::kButtonVEdgeMarginNew,
                     views::kButtonHEdgeMarginNew);
 
   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);
   layout->AddView(current_profile_name_);
 
   layout->StartRow(1, 0);
   layout->SkipColumns(1);
 
   layout->StartRow(1, 0);
   layout->SkipColumns(1);
@@ skipping 151 matching lines @@
   if (!is_primary_account) {
     email_button->set_menu_marker(menu_marker);
     layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   }
   layout->StartRow(1, 0);
   layout->AddView(email_button);
 
   // Save the original email address, as the button text could be elided.
   current_profile_accounts_map_[email_button] = account;
 }