ASH: Use virtual screen coordinates in Display::bounds()

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 94a28cdf6204869a88a0f07ae32366feb194073e..2bf9c38942038cf8ba3ed2b855dffec3ba8ece57 100644
--- a/ash/monitor/multi_monitor_manager_unittest.cc
+++ b/ash/monitor/multi_monitor_manager_unittest.cc
@@ -98,8 +98,8 @@ TEST_F(MultiMonitorManagerTest, NativeMonitorTest) {
   UpdateMonitor("0+0-500x500,0+501-400x400");
   EXPECT_EQ(2U, monitor_manager()->GetNumDisplays());
   EXPECT_EQ("1 1 0", GetCountSummary());
-  EXPECT_EQ(monitor_manager()->GetDisplayAt(0).id(), changed()[0].id());
-  EXPECT_EQ(monitor_manager()->GetDisplayAt(1).id(), added()[0].id());
+  EXPECT_EQ(monitor_manager()->GetDisplayAt(0)->id(), changed()[0].id());
+  EXPECT_EQ(monitor_manager()->GetDisplayAt(1)->id(), added()[0].id());
   EXPECT_EQ("0,0 500x500", changed()[0].bounds().ToString());
   EXPECT_EQ("0,0 400x400", added()[0].bounds().ToString());
   EXPECT_EQ("0,501 400x400", added()[0].bounds_in_pixel().ToString());
@@ -113,7 +113,7 @@ TEST_F(MultiMonitorManagerTest, NativeMonitorTest) {
   // Change primary.
   UpdateMonitor("0+0-1000x600");
   EXPECT_EQ("1 0 0", GetCountSummary());
-  EXPECT_EQ(monitor_manager()->GetDisplayAt(0).id(), changed()[0].id());
+  EXPECT_EQ(monitor_manager()->GetDisplayAt(0)->id(), changed()[0].id());
   EXPECT_EQ("0,0 1000x600", changed()[0].bounds().ToString());
   reset();
 
@@ -121,7 +121,7 @@ TEST_F(MultiMonitorManagerTest, NativeMonitorTest) {
   UpdateMonitor("0+0-1000x600,1001+0-600x400");
   EXPECT_EQ(2U, monitor_manager()->GetNumDisplays());
   EXPECT_EQ("0 1 0", GetCountSummary());
-  EXPECT_EQ(monitor_manager()->GetDisplayAt(1).id(), added()[0].id());
+  EXPECT_EQ(monitor_manager()->GetDisplayAt(1)->id(), added()[0].id());
   EXPECT_EQ("0,0 600x400", added()[0].bounds().ToString());
   EXPECT_EQ("1001,0 600x400", added()[0].bounds_in_pixel().ToString());
   reset();
@@ -130,7 +130,7 @@ TEST_F(MultiMonitorManagerTest, NativeMonitorTest) {
   UpdateMonitor("0+0-800x300");
   EXPECT_EQ(1U, monitor_manager()->GetNumDisplays());
   EXPECT_EQ("1 0 1", GetCountSummary());
-  EXPECT_EQ(monitor_manager()->GetDisplayAt(0).id(), changed()[0].id());
+  EXPECT_EQ(monitor_manager()->GetDisplayAt(0)->id(), changed()[0].id());
   EXPECT_EQ("0,0 800x300", changed()[0].bounds().ToString());
   reset();
 
@@ -142,7 +142,7 @@ TEST_F(MultiMonitorManagerTest, NativeMonitorTest) {
   EXPECT_FALSE(root_window_destroyed());
   // Monitor configuration stays the same
   EXPECT_EQ("0,0 800x300",
-            monitor_manager()->GetDisplayAt(0).bounds().ToString());
+            monitor_manager()->GetDisplayAt(0)->bounds().ToString());
   reset();
 
   // Connect to monitor again
@@ -164,11 +164,11 @@ TEST_F(MultiMonitorManagerTest, NativeMonitorTest) {
   UpdateMonitor("0+0-1000x600,1000+0-600x400");
   EXPECT_EQ(2U, monitor_manager()->GetNumDisplays());
   EXPECT_EQ("0,0 1000x600",
-            monitor_manager()->GetDisplayAt(0).bounds().ToString());
+            monitor_manager()->GetDisplayAt(0)->bounds().ToString());
   EXPECT_EQ("0,0 600x400",
-            monitor_manager()->GetDisplayAt(1).bounds().ToString());
+            monitor_manager()->GetDisplayAt(1)->bounds().ToString());
   EXPECT_EQ("1000,0 600x400",
-            monitor_manager()->GetDisplayAt(1).bounds_in_pixel().ToString());
+            monitor_manager()->GetDisplayAt(1)->bounds_in_pixel().ToString());
   reset();
 
   aura::MonitorManager::set_use_fullscreen_host_window(false);