Broke out layout metric information from ViewsDelegate to LayoutProvider

ash/test/ash_test_helper.h

 // Copyright 2013 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 ASH_TEST_ASH_TEST_HELPER_H_
 #define ASH_TEST_ASH_TEST_HELPER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 74 matching lines @@
 
   static TestSessionStateDelegate* GetTestSessionStateDelegate();
 
   TestShellDelegate* test_shell_delegate() { return test_shell_delegate_; }
   void set_test_shell_delegate(TestShellDelegate* test_shell_delegate) {
     test_shell_delegate_ = test_shell_delegate;
   }
   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_; }
 
   // Version of DisplayManagerTestApi::UpdateDisplay() for mash.
   void UpdateDisplayForMash(const std::string& display_spec);
 
   display::Display GetSecondaryDisplay();
 
   // Null in classic ash.
   mus::WindowManagerApplication* window_manager_app() {
@@ skipping 35 matching lines @@
   static Config config_;
 
   AshTestEnvironment* ash_test_environment_;  // Not owned.
   TestShellDelegate* test_shell_delegate_;  // Owned by ash::Shell.
   std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
 
   // Owned by ash::AcceleratorController.
   TestScreenshotDelegate* test_screenshot_delegate_;
 
   std::unique_ptr<::wm::WMState> wm_state_;
-  std::unique_ptr<AshTestViewsDelegate> views_delegate_;
+  std::unique_ptr<AshTestViewsDelegate> test_views_delegate_;

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

optional: Personally I wouldn't bother with changing this name. views_delegate_
is fine.

[Peter Kasting, 2017/04/12 22:48:00]

I asked for these changes, because the callers accessing these call methods that
only exist on TestViewsDelegate and not ViewsDelegate, and I was getting
confused reading them.

 
   // Check if DBus Thread Manager was initialized here.
   bool dbus_thread_manager_initialized_;
   // Check if Bluez DBus Manager was initialized here.
   bool bluez_dbus_manager_initialized_;
 
   aura::TestWindowTreeClientSetup window_tree_client_setup_;
   std::unique_ptr<mus::WindowManagerApplication> window_manager_app_;
   std::unique_ptr<aura::WindowTreeClientPrivate> window_tree_client_private_;
   // Id for the next Display created by CreateRootWindowController().
   int64_t next_display_id_ = 1;
 
   std::unique_ptr<TestSessionControllerClient> session_controller_client_;
 
   DISALLOW_COPY_AND_ASSIGN(AshTestHelper);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_ASH_TEST_HELPER_H_