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

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

Index: chrome/browser/ui/webui/signin/signin_utils.cc
diff --git a/chrome/browser/ui/webui/signin/signin_utils.cc b/chrome/browser/ui/webui/signin/signin_utils.cc
index 75f44599cf282bffe5e1bed30548fe016b71250c..cc398328f6668a1018509ce2381b6a3e77f758a4 100644
--- a/chrome/browser/ui/webui/signin/signin_utils.cc
+++ b/chrome/browser/ui/webui/signin/signin_utils.cc
@@ -65,20 +65,20 @@ Browser* GetDesktopBrowser(content::WebUI* 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
 }