Refactor screen/monitor so that gfx::Screen returns monitor object.

chrome/browser/ui/views/tabs/tab_drag_controller2_interactive_uitest.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 "chrome/browser/ui/views/tabs/tab_drag_controller2.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/property_bag.h"
@@ skipping 112 matching lines @@
   // be side by side.
   Browser* CreateAnotherWindowBrowserAndRelayout() {
     // Add another tab.
     AddTabAndResetBrowser(browser());
 
     // Create another browser.
     Browser* browser2 = CreateBrowser(browser()->profile());
     ResetIDs(browser2->tabstrip_model(), 100);
 
     // Resize the two windows so they're right next to each other.
-    gfx::Rect work_area = gfx::Screen::GetMonitorWorkAreaNearestWindow(
-        browser()->window()->GetNativeHandle());
+    gfx::Rect work_area = gfx::Screen::GetMonitorNearestWindow(
+        browser()->window()->GetNativeHandle()).work_area();
     gfx::Size half_size =
         gfx::Size(work_area.width() / 3 - 10, work_area.height() / 2 - 10);
     browser()->window()->SetBounds(gfx::Rect(work_area.origin(), half_size));
     browser2->window()->SetBounds(gfx::Rect(
         work_area.x() + half_size.width(), work_area.y(),
         half_size.width(), half_size.height()));
     return browser2;
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
@@ skipping 451 matching lines @@
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       browser2, ui::VKEY_ESCAPE, false, false, false, false));
 
   ASSERT_FALSE(tab_strip2->IsDragSessionActive());
   ASSERT_FALSE(TabDragController::IsActive());
   EXPECT_EQ("100 0 1", IDString(browser2->tabstrip_model()));
 
   // browser() will have been destroyed, but browser2 should remain.
   ASSERT_EQ(1u, BrowserList::size());
 }