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

chrome/browser/ui/views/frame/browser_non_client_frame_view.cc

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
index 24a7753a7a5500d2bd9c824cfa3e88ef1f3fd9c1..701349c95dda52e98df647693f68e3e2b827bbd0 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
@@ -147,8 +147,8 @@ void BrowserNonClientFrameView::UpdateNewStyleAvatarInfo(
 
   if (browser_view_->ShouldShowAvatar()) {
     if (!new_avatar_button_) {
-      base::string16 profile_name =
-          profiles::GetActiveProfileDisplayName(browser_view_->browser());
+      base::string16 profile_name = profiles::GetAvatarNameForProfile(
+          browser_view_->browser()->profile());
       new_avatar_button_ = new NewAvatarButton(
           listener, profile_name, style, browser_view_->browser());
       new_avatar_button_->set_id(VIEW_ID_NEW_AVATAR_BUTTON);