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

ash/monitor/multi_monitor_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/monitor/multi_monitor_manager.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/format_macros.h"
 #include "base/stl_util.h"
 #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();
        iter != parts.end(); ++iter) {
     monitors.push_back(aura::MonitorManager::CreateMonitorFromSpec(*iter));
   }
   return monitors;
 }
 
 }  // namespace
@@ skipping 52 matching lines @@
     ++removed_count_;
   }
 
   // aura::WindowObserver overrides:
   virtual void OnWindowDestroying(aura::Window* window) {
     ASSERT_EQ(Shell::GetRootWindow(), window);
     root_window_destroyed_ = true;
   }
 
   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());
   }
 
  private:
   vector<const Monitor*> changed_;
   vector<const Monitor*> added_;
   size_t removed_count_;
   bool root_window_destroyed_;
 
@@ skipping 110 matching lines @@
   reset();
 
   internal::MultiMonitorManager::CycleMonitor();
   EXPECT_EQ(1U, monitor_manager()->GetNumMonitors());
   EXPECT_EQ("0 0 0", GetCountSummary());
   reset();
 }
 
 }  // namespace test
 }  // namespace ash