Move LayoutProvider initialization to later in the startup process.

chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc

 // Copyright (c) 2012 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/views/chrome_browser_main_extra_parts_views.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"
@@ skipping 55 matching lines @@
 ChromeBrowserMainExtraPartsViews::~ChromeBrowserMainExtraPartsViews() {
   constrained_window::SetConstrainedWindowViewsClient(nullptr);
 }
 
 void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() {
   // The delegate needs to be set before any UI is created so that windows
   // display the correct icon.
   if (!views::ViewsDelegate::GetInstance())
     views_delegate_ = base::MakeUnique<ChromeViewsDelegate>();
 
-  if (!views::LayoutProvider::Get())
-    layout_provider_ = ChromeLayoutProvider::CreateLayoutProvider();
-
   SetConstrainedWindowViewsClient(CreateChromeConstrainedWindowViewsClient());
 
 #if defined(USE_AURA)
   if (ShouldCreateWMState())
     wm_state_.reset(new wm::WMState);
 #endif
 }
 
 void ChromeBrowserMainExtraPartsViews::PreCreateThreads() {
 #if defined(USE_AURA) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)
   // The screen may have already been set in test initialization.
   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() {
 #if defined(USE_AURA)
   // IME driver must be available at login screen, so initialize before profile.
   if (service_manager::ServiceManagerIsRemote())
     IMEDriver::Register();
 #endif
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
@@ skipping 49 matching lines @@
 
   // WMState is owned as a member, so don't have MusClient create it.
   const bool create_wm_state = false;
   mus_client_ = base::MakeUnique<views::MusClient>(
       connection->GetConnector(), service_manager::Identity(),
       content::BrowserThread::GetTaskRunnerForThread(
           content::BrowserThread::IO),
       create_wm_state);
 #endif  // defined(USE_AURA)
 }