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

ui/gfx/color_space.cc

Index: ui/gfx/color_space.cc
diff --git a/ui/gfx/color_space.cc b/ui/gfx/color_space.cc
index 18a25adba49131b5d0da035a4e57b2e6f8d78614..849d2201fc949e04b4fe87994917e245dc772725 100644
--- a/ui/gfx/color_space.cc
+++ b/ui/gfx/color_space.cc
@@ -143,6 +143,8 @@ sk_sp<SkColorSpace> ColorSpace::ToSkColorSpace() const {
   // Unspecified color spaces are represented as nullptr SkColorSpaces.
   if (*this == gfx::ColorSpace())
     return nullptr;
+  if (*this == gfx::ColorSpace::CreateSRGB())
+    return SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
 
   // TODO(crbug.com/634102): Support more than just ICC profile based color
   // spaces. The DCHECK here is to ensure that callers that expect a valid
@@ -158,6 +160,10 @@ ColorSpace ColorSpace::FromSkColorSpace(
     const sk_sp<SkColorSpace>& sk_color_space) {
   if (!sk_color_space)
     return gfx::ColorSpace();
+  if (SkColorSpace::Equals(
+          sk_color_space.get(),
+          SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named).get()))
+    return gfx::ColorSpace::CreateSRGB();
 
   // TODO(crbug.com/634102): Add conversion to gfx::ColorSpace.
   return gfx::ColorSpace();