Switch primary display

ash/display/multi_display_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/display/multi_display_manager.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/format_macros.h"
@@ skipping 47 matching lines @@
     changed_.clear();
     added_.clear();
     removed_count_ = 0U;
     root_window_destroyed_ = false;
   }
 
   bool root_window_destroyed() const {
     return root_window_destroyed_;
   }
 
+  const gfx::Display& FindDisplayForId(int64 id) {
+    return display_manager()->FindDisplayForId(id);
+  }
+
   // aura::DisplayObserver overrides:
   virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE {
     changed_.push_back(display);
   }
   virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE {
     added_.push_back(new_display);
   }
   virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE {
     ++removed_count_;
   }
@@ skipping 154 matching lines @@
   UpdateDisplay("1000x600*2");
   EXPECT_EQ(2,
             Shell::GetPrimaryRootWindow()->compositor()->device_scale_factor());
   EXPECT_EQ("500x300",
             Shell::GetPrimaryRootWindow()->bounds().size().ToString());
   aura::DisplayManager::set_use_fullscreen_host_window(false);
 }
 
 TEST_F(MultiDisplayManagerTest, MAYBE_TestNativeDisplaysChanged) {
   const int64 internal_display_id =
-      display_manager()->EnableInternalDisplayForTest();
+      display_manager()->SetFirstDisplayAsInternalDisplayForTest();
   const gfx::Display native_display(internal_display_id,
                                     gfx::Rect(0, 0, 500, 500));
 
   EXPECT_EQ(1U, display_manager()->GetNumDisplays());
   std::string default_bounds =
       display_manager()->GetDisplayAt(0)->bounds().ToString();
 
   std::vector<gfx::Display> displays;
   // Primary disconnected.
   display_manager()->OnNativeDisplaysChanged(displays);
   EXPECT_EQ(1U, display_manager()->GetNumDisplays());
   EXPECT_EQ(default_bounds,
             display_manager()->GetDisplayAt(0)->bounds().ToString());
 
   // External connected while primary was disconnected.
   displays.push_back(gfx::Display(10, gfx::Rect(1, 1, 100, 100)));
   display_manager()->OnNativeDisplaysChanged(displays);
   EXPECT_EQ(2U, display_manager()->GetNumDisplays());
   EXPECT_EQ(default_bounds,
-            display_manager()->GetDisplayAt(0)->bounds().ToString());
+            FindDisplayForId(internal_display_id).bounds().ToString());
   EXPECT_EQ("1,1 100x100",
-            display_manager()->GetDisplayAt(1)->bounds_in_pixel().ToString());
+            FindDisplayForId(10).bounds_in_pixel().ToString());
 
   // Primary connected, with different bounds.
   displays.clear();
   displays.push_back(native_display);
   displays.push_back(gfx::Display(10, gfx::Rect(1, 1, 100, 100)));
   display_manager()->OnNativeDisplaysChanged(displays);
   EXPECT_EQ(2U, display_manager()->GetNumDisplays());
   EXPECT_EQ("0,0 500x500",
-            display_manager()->GetDisplayAt(0)->bounds().ToString());
+            FindDisplayForId(internal_display_id).bounds().ToString());
   EXPECT_EQ("1,1 100x100",
-            display_manager()->GetDisplayAt(1)->bounds_in_pixel().ToString());
+            FindDisplayForId(10).bounds_in_pixel().ToString());
 
   // Turn off primary.
   displays.clear();
   displays.push_back(gfx::Display(10, gfx::Rect(1, 1, 100, 100)));
   display_manager()->OnNativeDisplaysChanged(displays);
   EXPECT_EQ(2U, display_manager()->GetNumDisplays());
   EXPECT_EQ("0,0 500x500",
-            display_manager()->GetDisplayAt(0)->bounds().ToString());
+            FindDisplayForId(internal_display_id).bounds().ToString());
   EXPECT_EQ("1,1 100x100",
-            display_manager()->GetDisplayAt(1)->bounds_in_pixel().ToString());
+            FindDisplayForId(10).bounds_in_pixel().ToString());
 
   // Emulate suspend.
   displays.clear();
   display_manager()->OnNativeDisplaysChanged(displays);
   EXPECT_EQ(2U, display_manager()->GetNumDisplays());
   EXPECT_EQ("0,0 500x500",
-            display_manager()->GetDisplayAt(0)->bounds().ToString());
+            FindDisplayForId(internal_display_id).bounds().ToString());
   EXPECT_EQ("1,1 100x100",
-            display_manager()->GetDisplayAt(1)->bounds_in_pixel().ToString());
+            FindDisplayForId(10).bounds_in_pixel().ToString());
 
   // External display has disconnected then resumed.
   displays.push_back(native_display);
   display_manager()->OnNativeDisplaysChanged(displays);
   EXPECT_EQ(1U, display_manager()->GetNumDisplays());
   EXPECT_EQ("0,0 500x500",
-            display_manager()->GetDisplayAt(0)->bounds().ToString());
+            FindDisplayForId(internal_display_id).bounds().ToString());
 }
 
 }  // namespace internal
 }  // namespace ash