Broke out layout metric information from ViewsDelegate to LayoutProvider

ui/views/mus/aura_init.cc

 // Copyright 2015 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 "ui/views/mus/aura_init.h"
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/path_service.h"
 #include "build/build_config.h"
 #include "services/catalog/public/cpp/resource_loader.h"
 #include "services/catalog/public/interfaces/constants.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "ui/aura/env.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
+#include "ui/views/layout/layout_provider.h"
 #include "ui/views/mus/mus_client.h"
 #include "ui/views/style/typography_provider.h"
 #include "ui/views/views_delegate.h"
 
 #if defined(OS_LINUX)
 #include "components/font_service/public/cpp/font_loader.h"
 #endif
 
 namespace views {
 
 namespace {
 
 class MusViewsDelegate : public ViewsDelegate {
  public:
   MusViewsDelegate() {}
   ~MusViewsDelegate() override {}
 
  private:
 #if defined(OS_WIN)
   HICON GetSmallWindowIcon() const override { return nullptr; }
 #endif
   void OnBeforeWidgetInit(
       Widget::InitParams* params,
       internal::NativeWidgetDelegate* delegate) override {}
 
-  const TypographyProvider& GetTypographyProvider() const override {
-    return typography_provider_;
-  }
-
-  DefaultTypographyProvider typography_provider_;
+  LayoutProvider layout_provider_;
 
   DISALLOW_COPY_AND_ASSIGN(MusViewsDelegate);
 };
 
 }  // namespace
 
 AuraInit::AuraInit(service_manager::Connector* connector,
                    const service_manager::Identity& identity,
                    const std::string& resource_file,
                    const std::string& resource_file_200,
@@ skipping 58 matching lines @@
   ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
       std::move(pak_file), base::MemoryMappedFile::Region::kWholeFile);
   ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile(
       std::move(pak_file_2), ui::SCALE_FACTOR_100P);
   if (!resource_file_200_.empty())
     ui::ResourceBundle::GetSharedInstance().AddDataPackFromFile(
         loader.TakeFile(resource_file_200_), ui::SCALE_FACTOR_200P);
 }
 
 }  // namespace views