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

ash/monitor/multi_monitor_manager_unittest.cc

Index: ash/monitor/multi_monitor_manager_unittest.cc
diff --git a/ash/monitor/multi_monitor_manager_unittest.cc b/ash/monitor/multi_monitor_manager_unittest.cc
index afd0013721c5746a872d01b880a6cbbf58f5d549..6ac00baf0673eb629732bdde70c1b53a175df5d2 100644
--- a/ash/monitor/multi_monitor_manager_unittest.cc
+++ b/ash/monitor/multi_monitor_manager_unittest.cc
@@ -11,22 +11,23 @@
 #include "base/string_split.h"
 #include "base/stringprintf.h"
 #include "ui/aura/env.h"
-#include "ui/aura/monitor.h"
+#include "ui/aura/monitor_observer.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window_observer.h"
+#include "ui/gfx/monitor.h"
 
 namespace ash {
 namespace test {
 
 using std::vector;
 using std::string;
-using aura::Monitor;
+using gfx::Monitor;
 
 namespace {
 
-vector<const aura::Monitor*> CreateMonitorsFromString(
+vector<const Monitor*> CreateMonitorsFromString(
     const std::string specs) {
-  vector<const aura::Monitor*> monitors;
+  vector<const Monitor*> monitors;
   vector<string> parts;
   base::SplitString(specs, ',', &parts);
   for (vector<string>::const_iterator iter = parts.begin();
@@ -99,7 +100,7 @@ class MultiMonitorManagerTest : public test::AshTestBase,
   }
 
   void UpdateMonitor(const std::string str) {
-    vector<const aura::Monitor*> monitors = CreateMonitorsFromString(str);
+    vector<const Monitor*> monitors = CreateMonitorsFromString(str);
     monitor_manager()->OnNativeMonitorsChanged(monitors);
     STLDeleteContainerPointers(monitors.begin(), monitors.end());
   }