[Cleanup]

 * Removed public API that returns pointer to internal display.
 * changed to use ScreenAsh::GetSecondaryDisplay instead of one in DisplayController
 * removed DisplayController::FindDisplayForRootWindow as there is only one caller.


BUG=253991

Review URL: https://chromiumcodereview.appspot.com/19287005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212304 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 3 deletions

diff --git a/ash/touch/touch_observer_hud_unittest.cc b/ash/touch/touch_observer_hud_unittest.cc
index 3c60543..b72300e 100644
--- a/ash/touch/touch_observer_hud_unittest.cc
+++ b/ash/touch/touch_observer_hud_unittest.cc
@@ -7,6 +7,7 @@
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
+#include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
@@ -49,12 +50,12 @@ class TouchHudTest : public test::AshTestBase {
         CreateDisplayInfo(mirrored_display_id_, gfx::Rect(0, 0, 100, 100));
   }
 
-  const gfx::Display& GetPrimaryDisplay() {
-    return GetDisplayController()->GetPrimaryDisplay();
+  gfx::Display GetPrimaryDisplay() {
+    return Shell::GetScreen()->GetPrimaryDisplay();
   }
 
   const gfx::Display& GetSecondaryDisplay() {
-    return *GetDisplayController()->GetSecondaryDisplay();
+    return ScreenAsh::GetSecondaryDisplay();
   }
 
   void SetupSingleDisplay() {