Don't try to initialize ash if we're not running in ash mode

chrome/browser/ui/startup/startup_browser_creator_impl.cc

Index: chrome/browser/ui/startup/startup_browser_creator_impl.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index 7434d9c7fff09403842d49496424ac332178f970..70cc3896902b87eb8b72a5b42b44d27ffa6559b4 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -809,17 +809,17 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(Browser* browser,
 #endif
   }
 
-#if defined(USE_ASH)
-  // Set the browser's root window to be an active root window now so
-  // that that web contents can determine correct scale factor for the
-  // renderer. This is a short term fix for crbug.com/155201.  Without
-  // this, the renderer may use wrong scale factor first, then
-  // switched to the correct scale factor, which can cause race
-  // condition and lead to the results rendered at wrong scale factor.
-  // Long term fix is tracked in crbug.com/15543.
-  ash::Shell::GetInstance()->set_active_root_window(
-      browser->window()->GetNativeWindow()->GetRootWindow());
-#endif
+  if (ash::Shell::HasInstance()) {
+    // Set the browser's root window to be an active root window now so
+    // that that web contents can determine correct scale factor for the
+    // renderer. This is a short term fix for crbug.com/155201.  Without
+    // this, the renderer may use wrong scale factor first, then
+    // switched to the correct scale factor, which can cause race
+    // condition and lead to the results rendered at wrong scale factor.
+    // Long term fix is tracked in crbug.com/15543.
+    ash::Shell::GetInstance()->set_active_root_window(
+        browser->window()->GetNativeWindow()->GetRootWindow());
+  }
 
   // In kiosk mode, we want to always be fullscreen, so switch to that now.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode))