Rename bounds accessors to be intuitive and consistent

ash/wm/workspace/multi_window_resize_controller_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/wm/workspace/multi_window_resize_controller.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace_controller.h"
@@ skipping 132 matching lines @@
   EXPECT_FALSE(HasPendingHide());
 
   // Force a show now.
   ShowNow();
   EXPECT_FALSE(HasPendingShow());
   EXPECT_TRUE(IsShowing());
   EXPECT_FALSE(HasPendingHide());
 
   // 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());
   EXPECT_FALSE(HasPendingHide());
 
   // Move the resize widget
   generator.PressLeftButton();
   generator.MoveMouseTo(bounds.x() + 10, bounds.y() + 10);
 
   // Delete w2.
@@ skipping 22 matching lines @@
   EXPECT_FALSE(HasPendingHide());
 
   // Force a show now.
   ShowNow();
   EXPECT_FALSE(HasPendingShow());
   EXPECT_TRUE(IsShowing());
   EXPECT_FALSE(HasPendingHide());
 
   // 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());
   EXPECT_FALSE(HasPendingHide());
 
   // Move the resize widget
   generator.PressLeftButton();
   generator.MoveMouseTo(bounds.x() + 11, bounds.y() + 10);
   generator.ReleaseLeftButton();
 
@@ skipping 26 matching lines @@
   EXPECT_TRUE(IsShowing());
   EXPECT_FALSE(HasPendingHide());
   EXPECT_FALSE(HasTarget(w3.get()));
 
   ShowNow();
   EXPECT_FALSE(HasPendingShow());
   EXPECT_TRUE(IsShowing());
   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);
 
   EXPECT_TRUE(HasTarget(w3.get()));
 }
 
 }  // namespace internal
 }  // namespace ash