Rename bounds accessors to be intuitive and consistent

ui/views/widget/widget_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 "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/point.h"
@@ skipping 738 matching lines @@
 
   anchor->Hide();
   anchor->CloseNow();
 }
 
 #if !defined(USE_AURA) && defined(OS_WIN)
 // Aura needs shell to maximize/fullscreen window.
 // NativeWidgetGtk doesn't implement GetRestoredBounds.
 TEST_F(WidgetTest, GetRestoredBounds) {
   Widget* toplevel = CreateTopLevelPlatformWidget();
-  EXPECT_EQ(toplevel->GetWindowScreenBounds().ToString(),
+  EXPECT_EQ(toplevel->GetWindowBoundsInScreen().ToString(),
             toplevel->GetRestoredBounds().ToString());
   toplevel->Show();
   toplevel->Maximize();
   RunPendingMessages();
-  EXPECT_NE(toplevel->GetWindowScreenBounds().ToString(),
+  EXPECT_NE(toplevel->GetWindowBoundsInScreen().ToString(),
             toplevel->GetRestoredBounds().ToString());
   EXPECT_GT(toplevel->GetRestoredBounds().width(), 0);
   EXPECT_GT(toplevel->GetRestoredBounds().height(), 0);
 
   toplevel->Restore();
   RunPendingMessages();
-  EXPECT_EQ(toplevel->GetWindowScreenBounds().ToString(),
+  EXPECT_EQ(toplevel->GetWindowBoundsInScreen().ToString(),
             toplevel->GetRestoredBounds().ToString());
 
   toplevel->SetFullscreen(true);
   RunPendingMessages();
-  EXPECT_NE(toplevel->GetWindowScreenBounds().ToString(),
+  EXPECT_NE(toplevel->GetWindowBoundsInScreen().ToString(),
             toplevel->GetRestoredBounds().ToString());
   EXPECT_GT(toplevel->GetRestoredBounds().width(), 0);
   EXPECT_GT(toplevel->GetRestoredBounds().height(), 0);
 }
 #endif
 
 // Test that window state is not changed after getting out of full screen.
 TEST_F(WidgetTest, ExitFullscreenRestoreState) {
   Widget* toplevel = CreateTopLevelPlatformWidget();
 
@@ skipping 28 matching lines @@
   // And it stays maximized after getting out of full screen.
   EXPECT_EQ(ui::SHOW_STATE_MAXIMIZED, GetWidgetShowState(toplevel));
 
   // Clean up.
   toplevel->Close();
   RunPendingMessages();
 }
 
 }  // namespace
 }  // namespace views