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

ui/gfx/screen_unittest.cc

Index: ui/gfx/screen_unittest.cc
diff --git a/ui/gfx/screen_unittest.cc b/ui/gfx/screen_unittest.cc
index 6d1f9f2789a9799399eb3593449efc2ef5d0fc13..bab02ceb12c4801714e785735c823e3c4e5c2055 100644
--- a/ui/gfx/screen_unittest.cc
+++ b/ui/gfx/screen_unittest.cc
@@ -1,17 +1,19 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/screen.h"
 
+#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/monitor.h"
+
 namespace {
 
 typedef testing::Test ScreenTest;
 
 TEST_F(ScreenTest, GetPrimaryMonitorSize) {
   // We aren't actually testing that it's correct, just that it's sane.
-  const gfx::Size size = gfx::Screen::GetPrimaryMonitorSize();
+  const gfx::Size size = gfx::Screen::GetPrimaryMonitor()->GetSize();
   EXPECT_GE(size.width(), 1);
   EXPECT_GE(size.height(), 1);
 }