Broke out layout metric information from ViewsDelegate to LayoutProvider

ui/views/test/test_views_delegate.h

 // 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.
 
 #ifndef UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_
 #define UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "build/build_config.h"
-#include "ui/views/style/typography_provider.h"
+#include "ui/views/layout/layout_provider.h"
 #include "ui/views/views_delegate.h"
 
 namespace views {
 
 class TestViewsDelegate : public ViewsDelegate {
  public:
   TestViewsDelegate();
   ~TestViewsDelegate() override;
 
   // If set to |true|, forces widgets that do not provide a native widget to use
@@ skipping 10 matching lines @@
   // Allows tests to provide a ContextFactory via the ViewsDelegate interface.
   void set_context_factory(ui::ContextFactory* context_factory) {
     context_factory_ = context_factory;
   }
 
   void set_context_factory_private(
       ui::ContextFactoryPrivate* context_factory_private) {
     context_factory_private_ = context_factory_private;
   }
 
+  void set_layout_provider(std::unique_ptr<LayoutProvider> layout_provider) {

[Peter Kasting, 2017/04/12 21:37:44]

Nit: Might want some comments about why this object is managed the way it is,
e.g. "For convenience, we create a layout provider by default, but embedders
that use their own layout provider subclasses may need to set those classes as
the layout providers for their tests."

[sky, 2017/04/12 22:43:58]

Given this runs a destructor I wouldn't inline it. e.g. call this
SetLayoutProvider and move implementation to .cc.

[kylix_rd, 2017/04/13 16:45:42]

Done.

[kylix_rd, 2017/04/13 16:45:42]

There are two separate .cc/mm files, test_views_delegate_aura.cc and
test_views_delegate_mac.mm. I'd have to add a platform-agnostic .cc file or
duplicate the code in each one.

I'd rather push this to a separate clean up CL.

+    layout_provider_.swap(layout_provider);
+  }
+
   // ViewsDelegate:
 #if defined(OS_WIN)
   HICON GetSmallWindowIcon() const override;
 #endif
   void OnBeforeWidgetInit(Widget::InitParams* params,
                           internal::NativeWidgetDelegate* delegate) override;
   ui::ContextFactory* GetContextFactory() override;
   ui::ContextFactoryPrivate* GetContextFactoryPrivate() override;
-  const TypographyProvider& GetTypographyProvider() const override;
 
  private:
   ui::ContextFactory* context_factory_;
   ui::ContextFactoryPrivate* context_factory_private_;
   bool use_desktop_native_widgets_;
   bool use_transparent_windows_;
-  DefaultTypographyProvider typography_provider_;
+  std::unique_ptr<LayoutProvider> layout_provider_;
 
   DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_TEST_TEST_VIEWS_DELEGATE_H_