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

chrome/browser/ui/webui/signin/signin_utils.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_utils.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 47 matching lines @@
 }
 
 Browser* GetDesktopBrowser(content::WebUI* web_ui) {
   Browser* browser =
       chrome::FindBrowserWithWebContents(web_ui->GetWebContents());
   if (!browser)
     browser = chrome::FindLastActiveWithProfile(Profile::FromWebUI(web_ui));
   return browser;
 }
 
-void SetInitializedModalHeight(content::WebUI* web_ui,
+void SetInitializedModalHeight(Browser* browser,
+                               content::WebUI* web_ui,
                                const base::ListValue* args) {
 #if defined(OS_CHROMEOS)
   NOTREACHED();
 #else
+  if (!browser)
+    return;
+
   double height;
   const bool success = args->GetDouble(0, &height);
   DCHECK(success);
-
-  Browser* browser = GetDesktopBrowser(web_ui);
-  if (browser) {
-    browser->signin_view_controller()->SetModalSigninHeight(
-        static_cast<int>(height));
-  }
+  browser->signin_view_controller()->SetModalSigninHeight(
+      static_cast<int>(height));
 #endif
 }
 
 bool IsForceSigninEnabled() {
   PrefService* prefs = g_browser_process->local_state();
   return prefs->GetBoolean(prefs::kForceBrowserSignin);
 }
 
 }  // namespace signin