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

ash/wm/workspace/workspace_manager_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/wm/workspace/workspace_manager.h"
 
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 41 matching lines @@
 
   aura::Window* GetViewport() {
     return Shell::GetInstance()->GetContainer(kShellWindowId_DefaultContainer);
   }
 
   const std::vector<Workspace*>& workspaces() const {
     return manager_->workspaces_;
   }
 
   gfx::Rect GetFullscreenBounds(aura::Window* window) {
-    return gfx::Screen::GetMonitorAreaNearestWindow(window);
+    return gfx::Screen::GetMonitorNearestWindow(window).bounds();
   }
 
   Workspace* active_workspace() {
     return manager_->active_workspace_;
   }
 
   Workspace* FindBy(aura::Window* window) const {
     return manager_->FindBy(window);
   }
 
@@ skipping 539 matching lines @@
 
   w2->Show();
   EXPECT_EQ(ShelfLayoutManager::HIDDEN, shelf->visibility_state());
 
   w2.reset();
   EXPECT_EQ(ShelfLayoutManager::VISIBLE, shelf->visibility_state());
 }
 
 }  // namespace internal
 }  // namespace ash