Rename bounds accessors to be intuitive and consistent

chrome/browser/ui/omnibox/omnibox_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 <stdio.h>
 
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ skipping 1263 matching lines @@
     return static_cast<BrowserView*>(browser()->window());
   }
 
   const views::View* GetFocusView() const {
     return GetBrowserView()->GetViewByID(location_bar_focus_view_id_);
   }
 
   // Move the mouse to the center of the browser window and left-click.
   void ClickBrowserWindowCenter() {
     ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(
-                    GetBrowserView()->GetScreenBounds().CenterPoint()));
+                    GetBrowserView()->GetBoundsInScreen().CenterPoint()));
     ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(
                     ui_controls::LEFT, ui_controls::DOWN));
     ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(
                     ui_controls::LEFT, ui_controls::UP));
   }
 
   // Press and release the mouse in the focus view at an offset from its origin.
   // If |release_offset| differs from |press_offset|, the mouse will be moved
   // between the press and release.
   void ClickFocusViewOrigin(ui_controls::MouseButton button,
                             const gfx::Point& press_offset,
                             const gfx::Point& release_offset) {
-    gfx::Point focus_view_origin = GetFocusView()->GetScreenBounds().origin();
+    gfx::Point focus_view_origin = GetFocusView()->GetBoundsInScreen().origin();
     gfx::Point press_point = focus_view_origin;
     press_point.Offset(press_offset.x(), press_offset.y());
     ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(press_point));
     ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(button, ui_controls::DOWN));
 
     gfx::Point release_point = focus_view_origin;
     release_point.Offset(release_offset.x(), release_offset.y());
     if (release_point != press_point)
       ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(release_point));
     ASSERT_TRUE(ui_test_utils::SendMouseEventsSync(button, ui_controls::UP));
@@ skipping 357 matching lines @@
 
   // Middle-clicking shouldn't select all the text either.
   ASSERT_NO_FATAL_FAILURE(
       ClickFocusViewOrigin(ui_controls::LEFT, kClickOffset, kClickOffset));
   ASSERT_NO_FATAL_FAILURE(ClickBrowserWindowCenter());
   ASSERT_NO_FATAL_FAILURE(
       ClickFocusViewOrigin(ui_controls::MIDDLE, kClickOffset, kClickOffset));
   EXPECT_FALSE(omnibox_view->IsSelectAll());
 }
 #endif  // defined(USE_AURA)