Migrate signin error messages to the new avatar bubble

chrome/browser/ui/sync/one_click_signin_sync_starter.cc

 // Copyright (c) 2012 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/sync/one_click_signin_sync_starter.h"
 
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 470 matching lines @@
       start_mode_ != CONFIGURE_SYNC_FIRST) {
     LoadContinueUrl();
   }
 
   delete this;
 }
 
 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
 Browser* OneClickSigninSyncStarter::EnsureBrowser(
     Browser* browser,
     Profile* profile,
     chrome::HostDesktopType desktop_type) {
   if (!browser) {
     // The user just created a new profile or has closed the browser that
     // we used previously. Grab the most recently active browser or else
@@ skipping 107 matching lines @@
                                             false /* user_gesture */);
 }
 
 void OneClickSigninSyncStarter::LoadContinueUrl() {
   web_contents()->GetController().LoadURL(
       continue_url_,
       content::Referrer(),
       content::PAGE_TRANSITION_AUTO_TOPLEVEL,
       std::string());
 }