Broke out layout metric information from ViewsDelegate to LayoutProvider

ui/views/test/scoped_views_test_helper.cc

Index: ui/views/test/scoped_views_test_helper.cc
diff --git a/ui/views/test/scoped_views_test_helper.cc b/ui/views/test/scoped_views_test_helper.cc
index 05727dbe06774f34aa14d29a218cc8d84e6563b4..7a8da8d3df52ef8c53406520adf11b710042272a 100644
--- a/ui/views/test/scoped_views_test_helper.cc
+++ b/ui/views/test/scoped_views_test_helper.cc
@@ -22,7 +22,7 @@ ScopedViewsTestHelper::ScopedViewsTestHelper()
 
 ScopedViewsTestHelper::ScopedViewsTestHelper(
     std::unique_ptr<TestViewsDelegate> views_delegate)
-    : views_delegate_(std::move(views_delegate)),
+    : test_views_delegate_(std::move(views_delegate)),
       platform_test_helper_(PlatformTestHelper::Create()) {
   // The ContextFactory must exist before any Compositors are created.
   ui::ContextFactory* context_factory = nullptr;
@@ -30,8 +30,8 @@ ScopedViewsTestHelper::ScopedViewsTestHelper(
   platform_test_helper_->InitializeContextFactory(&context_factory,
                                                   &context_factory_private);
 
-  views_delegate_->set_context_factory(context_factory);
-  views_delegate_->set_context_factory_private(context_factory_private);
+  test_views_delegate_->set_context_factory(context_factory);
+  test_views_delegate_->set_context_factory_private(context_factory_private);
 
   test_helper_.reset(ViewsTestHelper::Create(base::MessageLoopForUI::current(),
                                              context_factory,
@@ -49,7 +49,7 @@ ScopedViewsTestHelper::~ScopedViewsTestHelper() {
   test_helper_->TearDown();
   test_helper_.reset();
 
-  views_delegate_.reset();
+  test_views_delegate_.reset();
 
   // The Mus PlatformTestHelper has state that is deleted by
   // ui::TerminateContextFactoryForTests().