Broke out layout metric information from ViewsDelegate to LayoutProvider

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"
 #include "chrome/browser/ui/views/chrome_views_delegate.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/browser/ui/views/ime_driver/ime_driver_mus.h"
 #include "components/constrained_window/constrained_window_views.h"
 
 #if defined(USE_AURA)
 #include "base/run_loop.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/service_manager_connection.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/runner/common/client_util.h"
 #include "services/ui/public/cpp/gpu/gpu.h"  // nogncheck
@@ skipping 41 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_.reset(new ChromeViewsDelegate);
+    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() {
@@ skipping 64 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)
 }