Add more robust gfx::ColorSpace<->gfx::ICCProfile conversion

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 55 matching lines @@
 #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:
   static bool IsValidProfileLength(size_t length);
 
-  bool valid_ = false;
+  enum class Type {
+    // This is not a valid profile.
+    INVALID,
+    // This is from a gfx::ColorSpace. This ensures that GetColorSpace returns
+    // the exact same object as was used to create this.
+    FROM_COLOR_SPACE,
+    // This was created from ICC profile data.
+    FROM_DATA,
+    LAST = FROM_DATA
+  };
+  Type type_ = Type::INVALID;
+  gfx::ColorSpace color_space_;
   std::vector<char> data_;
 
   // This globally identifies this ICC profile. It is used to look up this ICC
   // profile from a ColorSpace object created from it.
   uint64_t id_ = 0;
 
   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>;
+  friend struct IPC::ParamTraits<gfx::ICCProfile::Type>;
   friend struct mojo::StructTraits<gfx::mojom::ICCProfileDataView,
                                    gfx::ICCProfile>;
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_ICC_PROFILE_H_