Reland "Use the same browser instance in the sync confirmation dialog.

chrome/browser/ui/webui/signin/signin_error_handler.cc

 // Copyright 2016 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/webui/signin/signin_error_handler.h"
 
 #include "base/bind.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_window.h"
 #include "chrome/browser/signin/signin_ui_util.h"
@@ skipping 52 matching lines @@
   browser->signin_view_controller()->CloseModalSignin();
   signin_ui_util::ShowSigninErrorLearnMorePage(browser->profile());
 }
 
 void SigninErrorHandler::HandleInitializedWithSize(
     const base::ListValue* args) {
   AllowJavascript();
   if (duplicate_profile_path_.empty())
     CallJavascriptFunction("signin.error.removeSwitchButton");
 
-  signin::SetInitializedModalHeight(web_ui(), args);
+  signin::SetInitializedModalHeight(signin::GetDesktopBrowser(web_ui()),
+                                    web_ui(), args);
 
   // After the dialog is shown, some platforms might have an element focused.
   // To be consistent, clear the focused element on all platforms.
   // TODO(anthonyvd): Figure out why this is needed on Mac and not other
   // platforms and if there's a way to start unfocused while avoiding this
   // workaround.
   CallJavascriptFunction("signin.error.clearFocus");
 }
 
 void SigninErrorHandler::CloseDialog() {
   if (is_system_profile_) {
     // Avoid closing the user manager window when the error message is displayed
     // without browser window.
     UserManagerProfileDialog::HideDialog();
   } else {
     Browser* browser = signin::GetDesktopBrowser(web_ui());
     DCHECK(browser);
     browser->signin_view_controller()->CloseModalSignin();
   }
 }