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

ui/ozone/common/display_util.cc

Index: ui/ozone/common/display_util.cc
diff --git a/ui/ozone/common/display_util.cc b/ui/ozone/common/display_util.cc
index 4ce67c0b840349634ede792d61713b0b9d5f12a1..4af871470d48abddc4cdde63e5cd36718b372f20 100644
--- a/ui/ozone/common/display_util.cc
+++ b/ui/ozone/common/display_util.cc
@@ -18,6 +18,7 @@ namespace ui {
 namespace {
 
 const int64_t kDummyDisplayId = 1;
+const int64_t kDummyProductId = 1;
 
 }  // namespace
 
@@ -58,6 +59,7 @@ DisplaySnapshot_Params GetDisplaySnapshotParams(
   if (params.has_native_mode)
     params.native_mode = GetDisplayModeParams(*display.native_mode());
 
+  params.product_id = display.product_id();
   params.string_representation = display.ToString();
 
   return params;
@@ -93,6 +95,7 @@ bool CreateSnapshotFromCommandLine(DisplaySnapshot_Params* snapshot_out) {
   snapshot_out->current_mode = mode_param;
   snapshot_out->has_native_mode = true;
   snapshot_out->native_mode = mode_param;
+  snapshot_out->product_id = kDummyProductId;
   return true;
 }
 
@@ -108,7 +111,8 @@ bool CreateSnapshotFromEDID(bool internal,
   if (!ParseOutputDeviceData(edid, &manufacturer_id,
                              &snapshot_out->display_name, &mode_param.size,
                              &snapshot_out->physical_size) ||
-      !GetDisplayIdFromEDID(edid, 0, &snapshot_out->display_id)) {
+      !GetDisplayIdFromEDID(edid, 0, &snapshot_out->display_id,
+                            &snapshot_out->product_id)) {
     return false;
   }
   ParseOutputOverscanFlag(edid, &snapshot_out->has_overscan);