Fix id tracking bug in ICCProfile

ui/gfx/icc_profile.h

 // 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.
 
 #ifndef UI_GFX_ICC_PROFILE_H_
 #define UI_GFX_ICC_PROFILE_H_
 
 #include <stdint.h>
 #include <vector>
 
@@ skipping 50 matching lines @@
   const std::vector<char>& GetData() const;
 
 #if defined(OS_WIN)
   // This will read monitor ICC profiles from disk and cache the results for the
   // other functions to read. This should not be called on the UI or IO thread.
   static void UpdateCachedProfilesOnBackgroundThread();
   static bool CachedProfilesNeedUpdate();
 #endif
 
  private:
+  friend ICCProfile ICCProfileForTestingAdobeRGB();
+  friend ICCProfile ICCProfileForTestingColorSpin();
+  friend ICCProfile ICCProfileForTestingGenericRGB();
+  friend ICCProfile ICCProfileForTestingSRGB();
+  static const uint64_t test_id_adobe_rgb_;
+  static const uint64_t test_id_color_spin_;
+  static const uint64_t test_id_generic_rgb_;
+  static const uint64_t test_id_srgb_;
+
+  // This method is used to hard-code the |id_| to a specific value, and is
+  // used by test methods to ensure that they don't conflict with the values
+  // generated in the browser.
+  static ICCProfile FromDataWithId(const void* icc_profile,
+                                   size_t size,
+                                   uint64_t id);
+
   // TODO(ccameron): Remove this function once its callerrs are gone.
   static ICCProfile FromSkColorSpace(sk_sp<SkColorSpace> color_space);
   static bool IsValidProfileLength(size_t length);
   void ComputeColorSpaceAndCache();
 
   // This globally identifies this ICC profile. It is used to look up this ICC
   // profile from a ColorSpace object created from it. The object is invalid if
   // |id_| is zero.
   uint64_t id_ = 0;
   std::vector<char> data_;
 
   gfx::ColorSpace color_space_;
 
   FRIEND_TEST_ALL_PREFIXES(SimpleColorSpace, BT709toSRGBICC);
   FRIEND_TEST_ALL_PREFIXES(SimpleColorSpace, GetColorSpace);
   friend int ::LLVMFuzzerTestOneInput(const uint8_t*, size_t);
   friend class ColorSpace;
   friend struct IPC::ParamTraits<gfx::ICCProfile>;
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_ICC_PROFILE_H_