Migrate signin error messages to the new avatar bubble

chrome/browser/ui/sync/one_click_signin_sync_starter.cc

Index: chrome/browser/ui/sync/one_click_signin_sync_starter.cc
diff --git a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
index de6db90f27f875ec1efb66650b52adf0d26ef344..1c262ece63f8e148494140e3e136cf5aaec82825 100644
--- a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
+++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc
@@ -488,22 +488,8 @@ void OneClickSigninSyncStarter::MergeSessionComplete(
 void OneClickSigninSyncStarter::DisplayFinalConfirmationBubble(
     const base::string16& custom_message) {
   browser_ = EnsureBrowser(browser_, profile_, desktop_type_);
-  // Show the success confirmation message in the new avatar menu if it is
-  // enabled.
-  // TODO(guohui): needs to handle custom messages.
-  if (custom_message.empty() && switches::IsNewAvatarMenu()) {
-    browser_->window()->ShowAvatarBubbleFromAvatarButton(
-        BrowserWindow::AVATAR_BUBBLE_MODE_CONFIRM_SIGNIN,
-        signin::ManageAccountsParams());
-    return;
-  }
-
-  browser_->window()->ShowOneClickSigninBubble(
-      BrowserWindow::ONE_CLICK_SIGNIN_BUBBLE_TYPE_BUBBLE,
-      base::string16(),  // No email required - this is not a SAML confirmation.
-      custom_message,
-      // Callback is ignored.
-      BrowserWindow::StartSyncCallback());
+  LoginUIServiceFactory::GetForProfile(browser_->profile())->
+      DisplayLoginResult(browser_, custom_message);
 }
 
 // static