Fix expected PlacementList sort order.

ui/display/display_layout_unittest.cc

 // Copyright 2016 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 "ui/display/display.h"
 
 #include <tuple>
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 73 matching lines @@
   EXPECT_EQ(150, layout->placement_list[0].offset);
 }
 
 TEST(DisplayLayoutTest, SwapPrimaryDisplayThreeDisplays) {
   std::unique_ptr<DisplayLayout> layout =
       DisplayLayoutBuilder(456)
           .AddDisplayPlacement(123, 456, Position::LEFT, 0)
           .AddDisplayPlacement(789, 456, Position::RIGHT, 0)
           .Build();
 
-  // Initial layout will be 123 --> 456 <-- 789.
+  // Note: Placement order is determined by least significant 8 bits of IDs.
+  // Initial layout will be 123 (0x7B) --> 456 (0x1C8) <-- 789 (0x315).
   EXPECT_EQ(456, layout->primary_id);
-  EXPECT_EQ(123, layout->placement_list[0].display_id);
+  EXPECT_EQ(789, layout->placement_list[0].display_id);
   EXPECT_EQ(456, layout->placement_list[0].parent_display_id);
-  EXPECT_EQ(Position::LEFT, layout->placement_list[0].position);
-  EXPECT_EQ(789, layout->placement_list[1].display_id);
+  EXPECT_EQ(Position::RIGHT, layout->placement_list[0].position);
+  EXPECT_EQ(123, layout->placement_list[1].display_id);
   EXPECT_EQ(456, layout->placement_list[1].parent_display_id);
-  EXPECT_EQ(Position::RIGHT, layout->placement_list[1].position);
+  EXPECT_EQ(Position::LEFT, layout->placement_list[1].position);
 
   // Swap layout to 123 --> 456 --> 789.
   layout->SwapPrimaryDisplay(789);
   EXPECT_EQ(789, layout->primary_id);
   EXPECT_EQ(123, layout->placement_list[0].display_id);
   EXPECT_EQ(456, layout->placement_list[0].parent_display_id);
   EXPECT_EQ(Position::LEFT, layout->placement_list[0].position);
   EXPECT_EQ(456, layout->placement_list[1].display_id);
   EXPECT_EQ(789, layout->placement_list[1].parent_display_id);
   EXPECT_EQ(Position::LEFT, layout->placement_list[1].position);
 
   // Swap layout to 123 <-- 456 <-- 789.
   layout->SwapPrimaryDisplay(123);
   EXPECT_EQ(123, layout->primary_id);
-  EXPECT_EQ(456, layout->placement_list[0].display_id);
-  EXPECT_EQ(123, layout->placement_list[0].parent_display_id);
+  EXPECT_EQ(789, layout->placement_list[0].display_id);
+  EXPECT_EQ(456, layout->placement_list[0].parent_display_id);
   EXPECT_EQ(Position::RIGHT, layout->placement_list[0].position);
-  EXPECT_EQ(789, layout->placement_list[1].display_id);
-  EXPECT_EQ(456, layout->placement_list[1].parent_display_id);
+  EXPECT_EQ(456, layout->placement_list[1].display_id);
+  EXPECT_EQ(123, layout->placement_list[1].parent_display_id);
   EXPECT_EQ(Position::RIGHT, layout->placement_list[1].position);
 }
 
+// Makes sure that only the least significant 8 bits of the display IDs in the
+// placement lists are used to validate their sort order.
+TEST(DisplayLayoutTest, PlacementSortOrder) {
+  // Sorted placement lists by full IDs, but not sorted by the least significant
+  // 8 bits of the IDs.
+  std::unique_ptr<DisplayLayout> layout(new DisplayLayout);
+  layout->primary_id = 456;
+  layout->placement_list.emplace_back(0x0405, 456, Position::LEFT, 0,
+                                      DisplayPlacement::TOP_LEFT);
+  layout->placement_list.emplace_back(0x0506, 0x0405, Position::RIGHT, 0,
+                                      DisplayPlacement::TOP_LEFT);
+  layout->placement_list.emplace_back(0x0604, 0x0506, Position::RIGHT, 0,
+                                      DisplayPlacement::TOP_LEFT);
+  EXPECT_FALSE(DisplayLayout::Validate({456, 0x0405, 0x0506, 0x0604}, *layout));
+
+  // Full IDs not sorted, but least significant 8 bits of the IDs are sorted.
+  layout->placement_list.clear();
+  layout->placement_list.emplace_back(0x0504, 456, Position::LEFT, 0,
+                                      DisplayPlacement::TOP_LEFT);
+  layout->placement_list.emplace_back(0x0605, 0x0504, Position::RIGHT, 0,
+                                      DisplayPlacement::TOP_LEFT);
+  layout->placement_list.emplace_back(0x0406, 0x0605, Position::RIGHT, 0,
+                                      DisplayPlacement::TOP_LEFT);
+  EXPECT_TRUE(DisplayLayout::Validate({456, 0x0504, 0x0605, 0x0406}, *layout));
+}
+
 namespace {
 
 class TwoDisplays
     : public testing::TestWithParam<std::tuple<
           // Primary Display Bounds
           gfx::Rect,
           // Secondary Display Bounds
           gfx::Rect,
           // Secondary Layout Position
           DisplayPlacement::Position,
@@ skipping 326 matching lines @@
         std::make_tuple(
             gfx::Rect(0, 0, 800, 600), gfx::Rect(0, 0, 1024, 768),
             DisplayPlacement::Position::RIGHT, 7, 0,
             gfx::Rect(0, 0, 800, 600), gfx::Rect(800, -175, 1024, 768)),
         std::make_tuple(
             gfx::Rect(0, 0, 800, 600), gfx::Rect(0, 0, 1024, 768),
             DisplayPlacement::Position::BOTTOM, 7, 0,
             gfx::Rect(0, 0, 800, 600), gfx::Rect(-231, 600, 1024, 768))));
 
 }  // namespace display