WelcomeHandler sometimes has browser_ null in ctor

chrome/browser/ui/webui/welcome_handler.cc

Index: chrome/browser/ui/webui/welcome_handler.cc
diff --git a/chrome/browser/ui/webui/welcome_handler.cc b/chrome/browser/ui/webui/welcome_handler.cc
index f23d092abea7153cdd0a8f17eaad2eb1b8817692..a99219f6136ebaa29d8ba3f32b3244773e602a6d 100644
--- a/chrome/browser/ui/webui/welcome_handler.cc
+++ b/chrome/browser/ui/webui/welcome_handler.cc
@@ -18,7 +18,6 @@
 
 WelcomeHandler::WelcomeHandler(content::WebUI* web_ui)
     : profile_(Profile::FromWebUI(web_ui)),
-      browser_(chrome::FindBrowserWithWebContents(web_ui->GetWebContents())),
       oauth2_token_service_(
           ProfileOAuth2TokenServiceFactory::GetForProfile(profile_)),
       result_(WelcomeResult::DEFAULT) {
@@ -46,7 +45,8 @@ void WelcomeHandler::HandleActivateSignIn(const base::ListValue* args) {
     // them away to the NTP instead.
     GoToNewTabPage();
   } else {
-    browser_->ShowModalSigninWindow(
+    Browser* browser = GetBrowser();
+    browser->ShowModalSigninWindow(

[Dan Beam, 2016/10/18 22:33:31]

nit: GetBrowser()->ShowModalSigninWindow(

         profiles::BubbleViewMode::BUBBLE_VIEW_MODE_GAIA_SIGNIN,
         signin_metrics::AccessPoint::ACCESS_POINT_START_PAGE);
   }
@@ -69,7 +69,16 @@ void WelcomeHandler::RegisterMessages() {
 }
 
 void WelcomeHandler::GoToNewTabPage() {
-  chrome::NavigateParams params(browser_, GURL(chrome::kChromeUINewTabURL),
+  chrome::NavigateParams params(GetBrowser(), GURL(chrome::kChromeUINewTabURL),
                                 ui::PageTransition::PAGE_TRANSITION_LINK);
   chrome::Navigate(&params);
 }
+
+Browser* WelcomeHandler::GetBrowser() {
+  DCHECK(web_ui());
+  content::WebContents* contents = web_ui()->GetWebContents();
+  DCHECK(contents);
+  Browser* browser = chrome::FindBrowserWithWebContents(contents);
+  DCHECK(browser);
+  return browser;
+}