Move LayoutProvider initialization to later in the startup process.

chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc

Index: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
index 556bd754b5435d347b193fd0119b59fb4bcf173c..489183680740f7af1f0d02039b86bd60076ee007 100644
--- a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
+++ b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
@@ -73,9 +73,6 @@ void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() {
   if (!views::ViewsDelegate::GetInstance())
     views_delegate_ = base::MakeUnique<ChromeViewsDelegate>();
 
-  if (!views::LayoutProvider::Get())
-    layout_provider_ = ChromeLayoutProvider::CreateLayoutProvider();
-
   SetConstrainedWindowViewsClient(CreateChromeConstrainedWindowViewsClient());
 
 #if defined(USE_AURA)
@@ -90,6 +87,11 @@ void ChromeBrowserMainExtraPartsViews::PreCreateThreads() {
   if (!display::Screen::GetScreen())
     display::Screen::SetScreenInstance(views::CreateDesktopScreen());
 #endif
+
+  // The layout_provider_ must be intialized here because it relies on

[Peter Kasting, 2017/04/14 18:44:49]

Nit: "here, and not in ToolkitInitialized(),"?

+  // ui::MaterialDesignController::Intialize() having already been called.

[Peter Kasting, 2017/04/14 18:44:49]

Nit: Maybe add

TODO(pkasting): Try to move ViewsDelegate creation here as well; see
https://crbug.com/691894#c1

+  if (!views::LayoutProvider::Get())
+    layout_provider_ = ChromeLayoutProvider::CreateLayoutProvider();
 }
 
 void ChromeBrowserMainExtraPartsViews::PreProfileInit() {