mash: Migrate ShelfLayoutManager ScreenUtil usage to ash common types.

ash/display/window_tree_host_manager_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "ash/display/window_tree_host_manager.h"
 
 #include <memory>
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/display/display_info.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
+#include "ash/common/wm/wm_screen_util.h"
 #include "ash/display/display_layout_store.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/display_util.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/test/ash_md_test_base.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/ash_test_helper.h"
@@ skipping 1266 matching lines @@
 namespace {
 
 class RootWindowTestObserver : public aura::WindowObserver {
  public:
   RootWindowTestObserver() {}
   ~RootWindowTestObserver() override {}
 
   void OnWindowBoundsChanged(aura::Window* window,
                              const gfx::Rect& old_bounds,
                              const gfx::Rect& new_bounds) override {
-    shelf_display_bounds_ = ScreenUtil::GetShelfDisplayBoundsInRoot(window);
+    shelf_display_bounds_ =
+        wm::GetDisplayBoundsWithShelf(WmWindowAura::Get(window));
   }
 
   const gfx::Rect& shelf_display_bounds() const {
     return shelf_display_bounds_;
   }
 
  private:
   gfx::Rect shelf_display_bounds_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindowTestObserver);
 };
 
 }  // names
 
-// Make sure that GetShelfDisplayBoundsInRoot returns the correct bounds
-// when primary display gets replaced in a following scenario.
+// Make sure that GetDisplayBoundsWithShelf returns the correct bounds
+// when the primary display gets replaced in one of the following scenarios:
 // 1) Two displays connected: a) b)
 // 2) both are disconnected and new one with the same size as b) is connected
 // in one configuration event.
 // See crbug.com/547280.
 TEST_P(WindowTreeHostManagerTest, ReplacePrimary) {
   if (!SupportsMultipleDisplays())
     return;
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
 
   DisplayInfo first_display_info =
@@ skipping 197 matching lines @@
       widget->GetNativeWindow()->GetRootWindow());
   event_generator.MoveMouseToCenterOf(widget->GetNativeWindow());
 
   UpdateDisplay("300x300");
   watcher.Stop();
 
   widget->CloseNow();
 }
 
 }  // namespace ash