Broke out layout metric information from ViewsDelegate to LayoutProvider

ui/views/test/scoped_views_test_helper.h

Index: ui/views/test/scoped_views_test_helper.h
diff --git a/ui/views/test/scoped_views_test_helper.h b/ui/views/test/scoped_views_test_helper.h
index bac1de0635ebf3f355d5401f5fc2a5a35f85b59a..c9f83d7811b9badb463045d1d0d0c1e0699bb6c1 100644
--- a/ui/views/test/scoped_views_test_helper.h
+++ b/ui/views/test/scoped_views_test_helper.h
@@ -37,14 +37,16 @@ class ScopedViewsTestHelper {
   // the RootWindow. Everywhere else, null.
   gfx::NativeWindow GetContext();
 
-  TestViewsDelegate* views_delegate() { return views_delegate_.get(); };
+  TestViewsDelegate* test_views_delegate() {
+    return test_views_delegate_.get();
+  }
 
   PlatformTestHelper* platform_test_helper() {
     return platform_test_helper_.get();
   }
 
  private:
-  std::unique_ptr<TestViewsDelegate> views_delegate_;
+  std::unique_ptr<TestViewsDelegate> test_views_delegate_;
   std::unique_ptr<ViewsTestHelper> test_helper_;
   std::unique_ptr<PlatformTestHelper> platform_test_helper_;