Rename bounds accessors to be intuitive and consistent

ash/wm/panel_layout_manager_unittest.cc

Index: ash/wm/panel_layout_manager_unittest.cc
diff --git a/ash/wm/panel_layout_manager_unittest.cc b/ash/wm/panel_layout_manager_unittest.cc
index 7835575d68ab079853c1f1153fbe8ae2bf8547d2..1e1c7a002b41dc5f0871b66cb8642758338c8442 100644
--- a/ash/wm/panel_layout_manager_unittest.cc
+++ b/ash/wm/panel_layout_manager_unittest.cc
@@ -80,7 +80,7 @@ class PanelLayoutManagerTest : public ash::test::AshTestBase {
     gfx::Rect icon_bounds = launcher->GetScreenBoundsOfItemIconForWindow(panel);
     ASSERT_FALSE(icon_bounds.IsEmpty());
 
-    gfx::Rect window_bounds = panel->GetRootWindowBounds();
+    gfx::Rect window_bounds = panel->GetBoundsInRootWindow();
 
     // 1-pixel tolerance--since we center panels over their icons, panels with
     // odd pixel widths won't be perfectly lined up with even pixel width
@@ -88,7 +88,7 @@ class PanelLayoutManagerTest : public ash::test::AshTestBase {
     EXPECT_NEAR(icon_bounds.CenterPoint().x(),
                 window_bounds.CenterPoint().x(),
                 1);
-    EXPECT_EQ(launcher->widget()->GetWindowScreenBounds().y(),
+    EXPECT_EQ(launcher->widget()->GetWindowBoundsInScreen().y(),
               window_bounds.bottom());
   }
 
@@ -98,10 +98,10 @@ class PanelLayoutManagerTest : public ash::test::AshTestBase {
     views::Widget* widget = NULL;
     GetCalloutWidget(&widget);
     EXPECT_TRUE(widget->IsVisible());
-    EXPECT_EQ(panel->GetRootWindowBounds().bottom(),
-              widget->GetWindowScreenBounds().y());
-    EXPECT_NEAR(panel->GetRootWindowBounds().CenterPoint().x(),
-                widget->GetWindowScreenBounds().CenterPoint().x(),
+    EXPECT_EQ(panel->GetBoundsInRootWindow().bottom(),
+              widget->GetWindowBoundsInScreen().y());
+    EXPECT_NEAR(panel->GetBoundsInRootWindow().CenterPoint().x(),
+                widget->GetWindowBoundsInScreen().CenterPoint().x(),
                 1);
   }