Broke out layout metric information from ViewsDelegate to LayoutProvider

ash/test/ash_test_helper.cc

Index: ash/test/ash_test_helper.cc
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index b18a6c98579fe9bff40205418bbd310b7e080d36..03580b3b629aff8f01398679469375bbc5234f79 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -88,7 +88,7 @@ void AshTestHelper::SetUp(bool start_session) {
   // WindowManager creates WMState for mash.
   if (config_ == Config::CLASSIC)
     wm_state_ = base::MakeUnique<::wm::WMState>();
-  views_delegate_ = ash_test_environment_->CreateViewsDelegate();
+  test_views_delegate_ = ash_test_environment_->CreateViewsDelegate();
 
   // Disable animations during tests.
   zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode(
@@ -218,7 +218,7 @@ void AshTestHelper::TearDown() {
   ui::ShutdownInputMethodForTesting();
   zero_duration_mode_.reset();
 
-  views_delegate_.reset();
+  test_views_delegate_.reset();
   wm_state_.reset();
 
   // WindowManager owns the CaptureController for mus/mash.