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

ui/gfx/color_space.cc

 // Copyright (c) 2012 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/gfx/color_space.h"
 
 #include <map>
 
 #include "base/lazy_instance.h"
 #include "base/synchronization/lock.h"
@@ skipping 125 matching lines @@
     if (primary_result > 0)
       return false;
   }
   return false;
 }
 
 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
   // result are notified of this incomplete functionality.
   std::vector<char> icc_data = gfx::ICCProfile::FromColorSpace(*this).GetData();
   sk_sp<SkColorSpace> result =
       SkColorSpace::MakeICC(icc_data.data(), icc_data.size());
   DCHECK(result);
   return result;
 }
 
 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();
 }
 
 }  // namespace gfx