Use consistent types for ICC profiles

ui/gfx/color_space.h

 // 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.
 
 #ifndef UI_GFX_COLOR_SPACE_H_
 #define UI_GFX_COLOR_SPACE_H_
 
 #include <stdint.h>
 
 #include "base/gtest_prod_util.h"
@@ skipping 144 matching lines @@
   // TODO: Remove these, and replace with more generic constructors.
   static ColorSpace CreateJpeg();
   static ColorSpace CreateREC601();
   static ColorSpace CreateREC709();
 
   bool operator==(const ColorSpace& other) const;
   bool operator!=(const ColorSpace& other) const;
   bool operator<(const ColorSpace& other) const;
 
   // Note that this may return nullptr.
-  sk_sp<SkColorSpace> ToSkColorSpace() const;
+  const sk_sp<SkColorSpace>& ToSkColorSpace() const { return sk_color_space_; }
   static ColorSpace FromSkColorSpace(const sk_sp<SkColorSpace>& sk_color_space);
 
  private:
   PrimaryID primaries_ = PrimaryID::UNSPECIFIED;
   TransferID transfer_ = TransferID::UNSPECIFIED;
   MatrixID matrix_ = MatrixID::UNSPECIFIED;
   RangeID range_ = RangeID::LIMITED;
 
   // Only used if primaries_ == PrimaryID::CUSTOM
   float custom_primary_matrix_[12];
 
   // This is used to look up the ICCProfile from which this ColorSpace was
   // created, if possible.
   uint64_t icc_profile_id_ = 0;
 
   sk_sp<SkColorSpace> sk_color_space_;
 
   friend class ICCProfile;
   friend class ColorSpaceToColorSpaceTransform;
   friend class ColorSpaceWin;
   friend struct IPC::ParamTraits<gfx::ColorSpace>;
   FRIEND_TEST_ALL_PREFIXES(SimpleColorSpace, GetColorSpace);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_COLOR_SPACE_H_