Move two utility functions from ash/screen_util.h to ui/wm/core/coordinate_conversion.h

ash/common/wm_window.cc

Index: ash/common/wm_window.cc
diff --git a/ash/common/wm_window.cc b/ash/common/wm_window.cc
index f7e86e1ed49bda6b80f80ef83918798d38ccde5b..d9ecd5c157ff6ce978d583abc716facedd1ad925 100644
--- a/ash/common/wm_window.cc
+++ b/ash/common/wm_window.cc
@@ -15,7 +15,6 @@
 #include "ash/common/wm_window_property.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
-#include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/wm/resize_handle_window_targeter.h"
 #include "ash/wm/resize_shadow_controller.h"
@@ -243,11 +242,11 @@ gfx::Point WmWindow::ConvertPointFromScreen(const gfx::Point& point) const {
 }
 
 gfx::Rect WmWindow::ConvertRectToScreen(const gfx::Rect& rect) const {
-  return ScreenUtil::ConvertRectToScreen(window_, rect);
+  return ::wm::ConvertRectToScreen(window_, rect);
 }
 
 gfx::Rect WmWindow::ConvertRectFromScreen(const gfx::Rect& rect) const {
-  return ScreenUtil::ConvertRectFromScreen(window_, rect);
+  return ::wm::ConvertRectFromScreen(window_, rect);
 }
 
 gfx::Size WmWindow::GetMinimumSize() const {