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 25db9e55eb70b71cc457568e0d0fe643eec16900..ea18c2b7ff40840802dec5b8dc1bb5c04f6f5d4a 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,15 @@ gfx::Point WmWindow::ConvertPointFromScreen(const gfx::Point& point) const {
 }
 
 gfx::Rect WmWindow::ConvertRectToScreen(const gfx::Rect& rect) const {
-  return ScreenUtil::ConvertRectToScreen(window_, rect);
+  gfx::Rect result(rect);
+  ::wm::ConvertRectToScreen(window_, &result);
+  return result;
 }
 
 gfx::Rect WmWindow::ConvertRectFromScreen(const gfx::Rect& rect) const {
-  return ScreenUtil::ConvertRectFromScreen(window_, rect);
+  gfx::Rect result(rect);
+  ::wm::ConvertRectFromScreen(window_, &result);
+  return result;
 }
 
 gfx::Size WmWindow::GetMinimumSize() const {