Broke out layout metric information from ViewsDelegate to LayoutProvider

ash/test/ash_test_helper.h

Index: ash/test/ash_test_helper.h
diff --git a/ash/test/ash_test_helper.h b/ash/test/ash_test_helper.h
index 0743b29cf52283cc875972cc10f4502ba459e4df..9e61a5f389fbf7e35e9c7bb1adc0633657d70a09 100644
--- a/ash/test/ash_test_helper.h
+++ b/ash/test/ash_test_helper.h
@@ -92,7 +92,9 @@ class AshTestHelper {
   TestScreenshotDelegate* test_screenshot_delegate() {
     return test_screenshot_delegate_;
   }
-  AshTestViewsDelegate* views_delegate() { return views_delegate_.get(); }
+  AshTestViewsDelegate* test_views_delegate() {
+    return test_views_delegate_.get();
+  }
 
   AshTestEnvironment* ash_test_environment() { return ash_test_environment_; }
 
@@ -148,7 +150,7 @@ class AshTestHelper {
   TestScreenshotDelegate* test_screenshot_delegate_;
 
   std::unique_ptr<::wm::WMState> wm_state_;
-  std::unique_ptr<AshTestViewsDelegate> views_delegate_;
+  std::unique_ptr<AshTestViewsDelegate> test_views_delegate_;
 
   // Check if DBus Thread Manager was initialized here.
   bool dbus_thread_manager_initialized_;