Rename bounds accessors to be intuitive and consistent

ash/shell_unittest.cc

Index: ash/shell_unittest.cc
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc
index 247a1229fc9169233d32ab35be5a7355a75f8557..3bf6cf396e6a73212c21799e4791a84c0256ed6c 100644
--- a/ash/shell_unittest.cc
+++ b/ash/shell_unittest.cc
@@ -267,9 +267,9 @@ TEST_F(ShellTest, MAYBE_ManagedWindowModeBasics) {
   views::Widget* launcher_widget = shell->launcher()->widget();
   EXPECT_TRUE(launcher_widget->IsVisible());
   // Launcher is at bottom-left of screen.
-  EXPECT_EQ(0, launcher_widget->GetWindowScreenBounds().x());
+  EXPECT_EQ(0, launcher_widget->GetWindowBoundsInScreen().x());
   EXPECT_EQ(Shell::GetPrimaryRootWindow()->GetHostSize().height(),
-            launcher_widget->GetWindowScreenBounds().bottom());
+            launcher_widget->GetWindowBoundsInScreen().bottom());
   // We have a desktop background but not a bare layer.
   EXPECT_TRUE(test_api.root_window_layout()->background_widget());
   EXPECT_FALSE(test_api.root_window_layout()->background_layer());