1 files changed, 19 insertions, 6 deletions

diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc
index 8882af9..f06aa78 100644
--- a/ash/display/display_manager_unittest.cc
+++ b/ash/display/display_manager_unittest.cc
@@ -11,6 +11,7 @@
 #include "ash/test/display_manager_test_api.h"
 #include "ash/test/mirror_window_test_api.h"
 #include "base/format_macros.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
@@ -27,6 +28,14 @@ using std::string;
 
 using base::StringPrintf;
 
+namespace {
+
+std::string ToDisplayName(int64 id) {
+  return "x-" + base::Int64ToString(id);
+}
+
+}  // namespace
+
 class DisplayManagerTest : public test::AshTestBase,
                            public gfx::DisplayObserver,
                            public aura::WindowObserver {
@@ -390,13 +399,13 @@ TEST_F(DisplayManagerTest, TestDeviceScaleOnlyChange) {
 }
 
 DisplayInfo CreateDisplayInfo(int64 id, const gfx::Rect& bounds) {
-  DisplayInfo info(id, StringPrintf("x-%d", static_cast<int>(id)), false);
+  DisplayInfo info(id, ToDisplayName(id), false);
   info.SetBounds(bounds);
   return info;
 }
 
 TEST_F(DisplayManagerTest, TestNativeDisplaysChanged) {
-  const int internal_display_id =
+  const int64 internal_display_id =
       test::DisplayManagerTestApi(display_manager()).
       SetFirstDisplayAsInternalDisplay();
   const int external_id = 10;
@@ -438,20 +447,24 @@ TEST_F(DisplayManagerTest, TestNativeDisplaysChanged) {
   EXPECT_FALSE(display_manager()->mirrored_display().is_valid());
   EXPECT_EQ(external_id, Shell::GetScreen()->GetPrimaryDisplay().id());
 
+  EXPECT_EQ(internal_display_id, gfx::Display::InternalDisplayId());
+
   // Primary connected, with different bounds.
   display_info_list.clear();
   display_info_list.push_back(internal_display_info);
   display_info_list.push_back(external_display_info);
   display_manager()->OnNativeDisplaysChanged(display_info_list);
   EXPECT_EQ(2U, display_manager()->GetNumDisplays());
-  // need to remember which is primary
+  EXPECT_EQ(internal_display_id, Shell::GetScreen()->GetPrimaryDisplay().id());
+
+  // This combinatino is new, so internal display becomes primary.
   EXPECT_EQ("0,0 500x500",
             FindDisplayForId(internal_display_id).bounds().ToString());
   EXPECT_EQ("1,1 100x100",
             FindDisplayInfoForId(10).bounds_in_pixel().ToString());
   EXPECT_EQ(2U, display_manager()->num_connected_displays());
   EXPECT_FALSE(display_manager()->mirrored_display().is_valid());
-  EXPECT_EQ(StringPrintf("x-%d", internal_display_id),
+  EXPECT_EQ(ToDisplayName(internal_display_id),
             display_manager()->GetDisplayNameForId(internal_display_id));
 
   // Emulate suspend.
@@ -464,7 +477,7 @@ TEST_F(DisplayManagerTest, TestNativeDisplaysChanged) {
             FindDisplayInfoForId(10).bounds_in_pixel().ToString());
   EXPECT_EQ(2U, display_manager()->num_connected_displays());
   EXPECT_FALSE(display_manager()->mirrored_display().is_valid());
-  EXPECT_EQ(StringPrintf("x-%d", internal_display_id),
+  EXPECT_EQ(ToDisplayName(internal_display_id),
             display_manager()->GetDisplayNameForId(internal_display_id));
 
   // External display has disconnected then resumed.
@@ -512,7 +525,7 @@ TEST_F(DisplayManagerTest, TestNativeDisplaysChanged) {
   EXPECT_TRUE(display_manager()->IsMirrored());
 
   // Test display name.
-  EXPECT_EQ(StringPrintf("x-%d", internal_display_id),
+  EXPECT_EQ(ToDisplayName(internal_display_id),
             display_manager()->GetDisplayNameForId(internal_display_id));
   EXPECT_EQ("x-10", display_manager()->GetDisplayNameForId(10));
   EXPECT_EQ("x-11", display_manager()->GetDisplayNameForId(11));