Rename bounds accessors to be intuitive and consistent

chrome/browser/ui/views/web_dialog_view_browsertest.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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_path.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
@@ skipping 91 matching lines @@
       new TestWebDialogView(browser()->profile(), delegate);
   WebContents* web_contents = chrome::GetActiveWebContents(browser());
   ASSERT_TRUE(web_contents != NULL);
   views::Widget::CreateWindowWithParent(
       view, web_contents->GetView()->GetTopLevelNativeWindow());
   view->GetWidget()->Show();
 
   // TestWebDialogView should quit current message loop on size change.
   view->set_should_quit_on_size_change(true);
 
-  gfx::Rect bounds = view->GetWidget()->GetClientAreaScreenBounds();
+  gfx::Rect bounds = view->GetWidget()->GetClientAreaBoundsInScreen();
 
   gfx::Rect set_bounds = bounds;
   gfx::Rect actual_bounds, rwhv_bounds;
 
   // Bigger than the default in both dimensions.
   set_bounds.set_width(400);
   set_bounds.set_height(300);
 
   view->MoveContents(web_contents, set_bounds);
   ui_test_utils::RunMessageLoop();  // TestWebDialogView will quit.
-  actual_bounds = view->GetWidget()->GetClientAreaScreenBounds();
+  actual_bounds = view->GetWidget()->GetClientAreaBoundsInScreen();
   EXPECT_EQ(set_bounds, actual_bounds);
 
   rwhv_bounds =
       view->web_contents()->GetRenderWidgetHostView()->GetViewBounds();
   EXPECT_LT(0, rwhv_bounds.width());
   EXPECT_LT(0, rwhv_bounds.height());
   EXPECT_GE(set_bounds.width(), rwhv_bounds.width());
   EXPECT_GE(set_bounds.height(), rwhv_bounds.height());
 
   // Larger in one dimension and smaller in the other.
   set_bounds.set_width(550);
   set_bounds.set_height(250);
 
   view->MoveContents(web_contents, set_bounds);
   ui_test_utils::RunMessageLoop();  // TestWebDialogView will quit.
-  actual_bounds = view->GetWidget()->GetClientAreaScreenBounds();
+  actual_bounds = view->GetWidget()->GetClientAreaBoundsInScreen();
   EXPECT_EQ(set_bounds, actual_bounds);
 
   rwhv_bounds =
       view->web_contents()->GetRenderWidgetHostView()->GetViewBounds();
   EXPECT_LT(0, rwhv_bounds.width());
   EXPECT_LT(0, rwhv_bounds.height());
   EXPECT_GE(set_bounds.width(), rwhv_bounds.width());
   EXPECT_GE(set_bounds.height(), rwhv_bounds.height());
 
   // Get very small.
   gfx::Size min_size = view->GetWidget()->GetMinimumSize();
   set_bounds.set_size(min_size);
 
   view->MoveContents(web_contents, set_bounds);
   ui_test_utils::RunMessageLoop();  // TestWebDialogView will quit.
-  actual_bounds = view->GetWidget()->GetClientAreaScreenBounds();
+  actual_bounds = view->GetWidget()->GetClientAreaBoundsInScreen();
   EXPECT_EQ(set_bounds, actual_bounds);
 
   rwhv_bounds =
       view->web_contents()->GetRenderWidgetHostView()->GetViewBounds();
   EXPECT_LT(0, rwhv_bounds.width());
   EXPECT_LT(0, rwhv_bounds.height());
   EXPECT_GE(set_bounds.width(), rwhv_bounds.width());
   EXPECT_GE(set_bounds.height(), rwhv_bounds.height());
 
   // Check to make sure we can't get to 0x0
   set_bounds.set_width(0);
   set_bounds.set_height(0);
 
   view->MoveContents(web_contents, set_bounds);
   ui_test_utils::RunMessageLoop();  // TestWebDialogView will quit.
-  actual_bounds = view->GetWidget()->GetClientAreaScreenBounds();
+  actual_bounds = view->GetWidget()->GetClientAreaBoundsInScreen();
   EXPECT_LT(0, actual_bounds.width());
   EXPECT_LT(0, actual_bounds.height());
 }