Rename bounds accessors to be intuitive and consistent

ash/wm/workspace/multi_window_resize_controller_unittest.cc

Index: ash/wm/workspace/multi_window_resize_controller_unittest.cc
diff --git a/ash/wm/workspace/multi_window_resize_controller_unittest.cc b/ash/wm/workspace/multi_window_resize_controller_unittest.cc
index 4dbf4f20d9f2843ce0b25ad84aa48e5b94d94519..12dc0c92a56577710a3da2aab9cdbdcd9743b128 100644
--- a/ash/wm/workspace/multi_window_resize_controller_unittest.cc
+++ b/ash/wm/workspace/multi_window_resize_controller_unittest.cc
@@ -150,7 +150,7 @@ TEST_F(MultiWindowResizeControllerTest, DeleteWindow) {
 
   // Move the mouse over the resize widget.
   ASSERT_TRUE(resize_widget());
-  gfx::Rect bounds(resize_widget()->GetWindowScreenBounds());
+  gfx::Rect bounds(resize_widget()->GetWindowBoundsInScreen());
   generator.MoveMouseTo(bounds.x() + 1, bounds.y() + 1);
   EXPECT_FALSE(HasPendingShow());
   EXPECT_TRUE(IsShowing());
@@ -193,7 +193,7 @@ TEST_F(MultiWindowResizeControllerTest, Drag) {
 
   // Move the mouse over the resize widget.
   ASSERT_TRUE(resize_widget());
-  gfx::Rect bounds(resize_widget()->GetWindowScreenBounds());
+  gfx::Rect bounds(resize_widget()->GetWindowBoundsInScreen());
   generator.MoveMouseTo(bounds.x() + 1, bounds.y() + 1);
   EXPECT_FALSE(HasPendingShow());
   EXPECT_TRUE(IsShowing());
@@ -240,7 +240,7 @@ TEST_F(MultiWindowResizeControllerTest, Three) {
   EXPECT_FALSE(HasPendingHide());
 
   // w3 should be picked up when resize is started.
-  gfx::Rect bounds(resize_widget()->GetWindowScreenBounds());
+  gfx::Rect bounds(resize_widget()->GetWindowBoundsInScreen());
   generator.MoveMouseTo(bounds.x() + 1, bounds.y() + 1);
   generator.PressLeftButton();
   generator.MoveMouseTo(bounds.x() + 11, bounds.y() + 10);