Fix sign-in error strings.

chrome/browser/signin/signin_global_error.cc

Index: chrome/browser/signin/signin_global_error.cc
diff --git a/chrome/browser/signin/signin_global_error.cc b/chrome/browser/signin/signin_global_error.cc
index e4f5b71bb42ac524a298a0f77810d5941a66d736..698e78b46f16103146a5a8b2210c89471fce85c5 100644
--- a/chrome/browser/signin/signin_global_error.cc
+++ b/chrome/browser/signin/signin_global_error.cc
@@ -31,7 +31,8 @@ SigninGlobalError::SigninGlobalError(
     : profile_(profile),
       error_controller_(error_controller) {
   error_controller_->AddObserver(this);
-  GlobalErrorServiceFactory::GetForProfile(profile_)->AddGlobalError(this);
+  if (!switches::IsNewProfileManagement())
+    GlobalErrorServiceFactory::GetForProfile(profile_)->AddGlobalError(this);
 }
 
 SigninGlobalError::~SigninGlobalError() {
@@ -51,7 +52,9 @@ void SigninGlobalError::AttemptToFixError(Browser* browser) {
 }
 
 void SigninGlobalError::Shutdown() {
-  GlobalErrorServiceFactory::GetForProfile(profile_)->RemoveGlobalError(this);
+  if (!switches::IsNewProfileManagement())
+    GlobalErrorServiceFactory::GetForProfile(profile_)->RemoveGlobalError(this);
+
   error_controller_->RemoveObserver(this);
   error_controller_ = NULL;
 }
@@ -90,9 +93,14 @@ void SigninGlobalError::ExecuteMenuItem(Browser* browser) {
     return;
   }
 
-  chrome::ShowSingletonTab(
-      browser,
-      signin::GetReauthURL(profile_, error_controller_->error_account_id()));
+  if (switches::IsNewProfileManagement()) {
+    browser->window()->ShowAvatarBubbleFromAvatarButton(
+        BrowserWindow::AVATAR_BUBBLE_MODE_REAUTH);
+  } else {
+    chrome::ShowSingletonTab(
+        browser,
+        signin::GetReauthURL(profile_, error_controller_->error_account_id()));
+  }
 #endif
 }