Rename bounds accessors to be intuitive and consistent

ash/system/tray/system_tray_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/system/tray/system_tray.h"
 
 #include <vector>
 
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_item.h"
@@ skipping 120 matching lines @@
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
   RunAllPendingInMessageLoop();
   ASSERT_TRUE(test_item->default_view() != NULL);
   ASSERT_TRUE(detailed_item->detailed_view() == NULL);
 }
 
 TEST_F(SystemTrayTest, TrayWidgetAutoResizes) {
   SystemTray* tray = GetSystemTray();
   ASSERT_TRUE(tray->GetWidget());
 
-  gfx::Size widget_size = tray->GetWidget()->GetWindowScreenBounds().size();
+  gfx::Size widget_size = tray->GetWidget()->GetWindowBoundsInScreen().size();
 
   TestItem* test_item = new TestItem;
   tray->AddTrayItem(test_item);
 
-  gfx::Size new_size = tray->GetWidget()->GetWindowScreenBounds().size();
+  gfx::Size new_size = tray->GetWidget()->GetWindowBoundsInScreen().size();
 
   // Adding the new item should change the size of the tray.
   EXPECT_NE(widget_size.ToString(), new_size.ToString());
 
   // Hiding the tray view of the new item should also change the size of the
   // tray.
   test_item->tray_view()->SetVisible(false);
   EXPECT_EQ(widget_size.ToString(),
-            tray->GetWidget()->GetWindowScreenBounds().size().ToString());
+            tray->GetWidget()->GetWindowBoundsInScreen().size().ToString());
 
   test_item->tray_view()->SetVisible(true);
   EXPECT_EQ(new_size.ToString(),
-            tray->GetWidget()->GetWindowScreenBounds().size().ToString());
+            tray->GetWidget()->GetWindowBoundsInScreen().size().ToString());
 }
 
 TEST_F(SystemTrayTest, SystemTrayNotifications) {
   SystemTray* tray = GetSystemTray();
   ASSERT_TRUE(tray->GetWidget());
 
   TestItem* test_item = new TestItem;
   TestItem* detailed_item = new TestItem;
   tray->AddTrayItem(test_item);
   tray->AddTrayItem(detailed_item);
@@ skipping 32 matching lines @@
   tray->AddTrayItem(test_item);
 
   // Ensure the tray views are created.
   ASSERT_TRUE(test_item->tray_view() != NULL);
 
   // Show the default view, ensure the notification view is destroyed.
   tray->ShowDefaultView(BUBBLE_CREATE_NEW);
   RunAllPendingInMessageLoop();
 
   views::Widget* widget = test_item->default_view()->GetWidget();
-  gfx::Rect bubble_bounds = widget->GetWindowScreenBounds();
+  gfx::Rect bubble_bounds = widget->GetWindowBoundsInScreen();
 
   tray->ShowDetailedView(test_item, 0, true, BUBBLE_USE_EXISTING);
   RunAllPendingInMessageLoop();
 
   EXPECT_FALSE(test_item->default_view());
 
   EXPECT_EQ(bubble_bounds.ToString(), test_item->detailed_view()->GetWidget()->
-      GetWindowScreenBounds().ToString());
+      GetWindowBoundsInScreen().ToString());
   EXPECT_EQ(widget, test_item->detailed_view()->GetWidget());
 
   tray->ShowDefaultView(BUBBLE_USE_EXISTING);
   RunAllPendingInMessageLoop();
 
   EXPECT_EQ(bubble_bounds.ToString(), test_item->default_view()->GetWidget()->
-      GetWindowScreenBounds().ToString());
+      GetWindowBoundsInScreen().ToString());
   EXPECT_EQ(widget, test_item->default_view()->GetWidget());
 }
 
 }  // namespace test
 }  // namespace ash