Load ICC file for display color correction based on display product identifier

ui/display/util/edid_parser_unittest.cc

 // Copyright 2014 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/util/edid_parser.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/size.h"
 
@@ skipping 207 matching lines @@
   manufacturer_id = 0;
   EXPECT_TRUE(
       ParseOutputDeviceData(edid, &manufacturer_id, nullptr, &dummy, &dummy));
   EXPECT_EQ(0x22f0u, manufacturer_id);
 }
 
 TEST(EDIDParserTest, GetDisplayId) {
   // EDID of kLP2565A and B are slightly different but actually the same device.
   int64_t id1 = -1;
   int64_t id2 = -1;
+  int64_t product_id1 = -1;
+  int64_t product_id2 = -1;
   std::vector<uint8_t> edid(kLP2565A, kLP2565A + charsize(kLP2565A));
-  EXPECT_TRUE(GetDisplayIdFromEDID(edid, 0, &id1));
+  EXPECT_TRUE(GetDisplayIdFromEDID(edid, 0, &id1, &product_id1));
   edid.assign(kLP2565B, kLP2565B + charsize(kLP2565B));
-  EXPECT_TRUE(GetDisplayIdFromEDID(edid, 0, &id2));
+  EXPECT_TRUE(GetDisplayIdFromEDID(edid, 0, &id2, &product_id2));
   EXPECT_EQ(id1, id2);
+  EXPECT_EQ(product_id1, product_id2);
   EXPECT_NE(-1, id1);
+  EXPECT_NE(-1, product_id1);
 }
 
 TEST(EDIDParserTest, GetDisplayIdFromInternal) {
   int64_t id = -1;
+  int64_t product_id = -1;
   std::vector<uint8_t> edid(
       kInternalDisplay, kInternalDisplay + charsize(kInternalDisplay));
-  EXPECT_TRUE(GetDisplayIdFromEDID(edid, 0, &id));
+  EXPECT_TRUE(GetDisplayIdFromEDID(edid, 0, &id, &product_id));
   EXPECT_NE(-1, id);
+  EXPECT_NE(-1, product_id);
 }
 
 TEST(EDIDParserTest, GetDisplayIdFailure) {
   int64_t id = -1;
+  int64_t product_id = -1;
   std::vector<uint8_t> edid;
-  EXPECT_FALSE(GetDisplayIdFromEDID(edid, 0, &id));
+  EXPECT_FALSE(GetDisplayIdFromEDID(edid, 0, &id, &product_id));
   EXPECT_EQ(-1, id);
+  EXPECT_EQ(-1, product_id);
 }
 
 }   // namespace ui