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

ash/screen_util_unittest.cc

Index: ash/screen_util_unittest.cc
diff --git a/ash/screen_util_unittest.cc b/ash/screen_util_unittest.cc
index 3d5850ee2b6741bb5d0dd0d2e728fca1bf43e5a8..bca09772ac87855c6a9b5717fe0b4ca802141bfd 100644
--- a/ash/screen_util_unittest.cc
+++ b/ash/screen_util_unittest.cc
@@ -16,6 +16,7 @@
 #include "ui/display/manager/display_manager.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
+#include "ui/wm/core/coordinate_conversion.h"
 
 namespace ash {
 namespace test {
@@ -96,21 +97,21 @@ TEST_P(ScreenUtilTest, ConvertRect) {
   secondary->Show();
 
   EXPECT_EQ("0,0 100x100",
-            ScreenUtil::ConvertRectFromScreen(primary->GetNativeView(),
-                                              gfx::Rect(10, 10, 100, 100))
+            ::wm::ConvertRectFromScreen(primary->GetNativeView(),
+                                        gfx::Rect(10, 10, 100, 100))
                 .ToString());
   EXPECT_EQ("10,10 100x100",
-            ScreenUtil::ConvertRectFromScreen(secondary->GetNativeView(),
-                                              gfx::Rect(620, 20, 100, 100))
+            ::wm::ConvertRectFromScreen(secondary->GetNativeView(),
+                                        gfx::Rect(620, 20, 100, 100))
                 .ToString());
 
   EXPECT_EQ("40,40 100x100",
-            ScreenUtil::ConvertRectToScreen(primary->GetNativeView(),
-                                            gfx::Rect(30, 30, 100, 100))
+            ::wm::ConvertRectToScreen(primary->GetNativeView(),
+                                      gfx::Rect(30, 30, 100, 100))
                 .ToString());
   EXPECT_EQ("650,50 100x100",
-            ScreenUtil::ConvertRectToScreen(secondary->GetNativeView(),
-                                            gfx::Rect(40, 40, 100, 100))
+            ::wm::ConvertRectToScreen(secondary->GetNativeView(),
+                                      gfx::Rect(40, 40, 100, 100))
                 .ToString());
 }