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

ui/aura/test/single_monitor_manager.cc

Index: ui/aura/test/single_monitor_manager.cc
diff --git a/ui/aura/test/single_monitor_manager.cc b/ui/aura/test/single_monitor_manager.cc
index 6e5250088f9f9d402f4545181f588f4ff5b5a780..a7af265033dc77e1bd6a25ecb62d76bb95196aad 100644
--- a/ui/aura/test/single_monitor_manager.cc
+++ b/ui/aura/test/single_monitor_manager.cc
@@ -8,7 +8,7 @@
 
 #include "base/command_line.h"
 #include "ui/aura/aura_switches.h"
-#include "ui/aura/monitor.h"
+#include "ui/aura/monitor_aura.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/root_window_host.h"
 #include "ui/gfx/rect.h"
@@ -37,7 +37,7 @@ SingleMonitorManager::~SingleMonitorManager() {
 }
 
 void SingleMonitorManager::OnNativeMonitorsChanged(
-    const std::vector<const Monitor*>& monitors) {
+    const std::vector<const MonitorAura*>& monitors) {
   DCHECK(monitors.size() > 0);
   if (use_fullscreen_host_window()) {
     monitor_->set_size(monitors[0]->bounds().size());
@@ -46,7 +46,7 @@ void SingleMonitorManager::OnNativeMonitorsChanged(
 }
 
 RootWindow* SingleMonitorManager::CreateRootWindowForMonitor(
-    Monitor* monitor) {
+    MonitorAura* monitor) {
   DCHECK(!root_window_);
   DCHECK_EQ(monitor_.get(), monitor);
   root_window_ = new RootWindow(monitor->bounds());
@@ -54,25 +54,26 @@ RootWindow* SingleMonitorManager::CreateRootWindowForMonitor(
   return root_window_;
 }
 
-const Monitor* SingleMonitorManager::GetMonitorNearestWindow(
-    const Window* window) const {
-  return monitor_.get();
+MonitorAura* SingleMonitorManager::GetMonitorAt(size_t index) {
+  return !index ? monitor_.get() : NULL;
 }
 
-const Monitor* SingleMonitorManager::GetMonitorNearestPoint(
-    const gfx::Point& point) const {
-  return monitor_.get();
+size_t SingleMonitorManager::GetNumMonitors() const {
+  return 1;
 }
 
-Monitor* SingleMonitorManager::GetMonitorAt(size_t index) {
-  return !index ? monitor_.get() : NULL;
+const MonitorAura* SingleMonitorManager::GetMonitorNearestWindow(
+    const Window* window) const {
+  return monitor_.get();
 }
 
-size_t SingleMonitorManager::GetNumMonitors() const {
-  return 1;
+MonitorAura* SingleMonitorManager::GetMonitorNearestWindow(
+    const Window* window) {
+  return monitor_.get();
 }
 
-Monitor* SingleMonitorManager::GetMonitorNearestWindow(const Window* window) {
+const MonitorAura* SingleMonitorManager::GetMonitorNearestPoint(
+    const gfx::Point& point) const {
   return monitor_.get();
 }