Broke out layout metric information from ViewsDelegate to LayoutProvider

ui/views/test/scoped_views_test_helper.h

 // Copyright 2015 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_SCOPED_VIEWS_TEST_HELPER_H_
 #define UI_VIEWS_TEST_SCOPED_VIEWS_TEST_HELPER_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 19 matching lines @@
   // ContextFactory.
   explicit ScopedViewsTestHelper(
       std::unique_ptr<TestViewsDelegate> views_delegate);
 
   ~ScopedViewsTestHelper();
 
   // Returns the context for creating new windows. In Aura builds, this will be
   // the RootWindow. Everywhere else, null.
   gfx::NativeWindow GetContext();
 
-  TestViewsDelegate* views_delegate() { return views_delegate_.get(); };
+  TestViewsDelegate* test_views_delegate() {
+    return test_views_delegate_.get();
+  };

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

remove trailing ;

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

Done.

 
   PlatformTestHelper* platform_test_helper() {
     return platform_test_helper_.get();
   }
 
  private:
-  std::unique_ptr<TestViewsDelegate> views_delegate_;
+  std::unique_ptr<TestViewsDelegate> test_views_delegate_;

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

optional: leave existing name.

   std::unique_ptr<ViewsTestHelper> test_helper_;
   std::unique_ptr<PlatformTestHelper> platform_test_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedViewsTestHelper);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_TEST_SCOPED_VIEWS_TEST_HELPER_H_