Color: Separate ICCProfile and ColorSpace structures

ui/gfx/icc_profile_mac.mm

Index: ui/gfx/icc_profile_mac.mm
diff --git a/ui/gfx/color_space_mac.mm b/ui/gfx/icc_profile_mac.mm
similarity index 69%
rename from ui/gfx/color_space_mac.mm
rename to ui/gfx/icc_profile_mac.mm
index 630554b16e3ea7adfcb4034f98c6c7d752da4e0b..92fe8dde12f4e3db2f10a17539c561c8bf573c49 100644
--- a/ui/gfx/color_space_mac.mm
+++ b/ui/gfx/icc_profile_mac.mm
@@ -2,33 +2,29 @@
 // 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"
-
-#import <Cocoa/Cocoa.h>
-#include <stddef.h>
+#include "ui/gfx/icc_profile.h"
 
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
-#include "ui/gfx/mac/coordinate_conversion.h"
 
 namespace gfx {
 
 // static
-ColorSpace ColorSpace::FromBestMonitor() {
+ICCProfile ICCProfile::FromBestMonitor() {
   return FromCGColorSpace(base::mac::GetSystemColorSpace());
 }
 
 // static
-ColorSpace ColorSpace::FromCGColorSpace(CGColorSpaceRef cg_color_space) {
+ICCProfile ICCProfile::FromCGColorSpace(CGColorSpaceRef cg_color_space) {
   base::ScopedCFTypeRef<CFDataRef> cf_icc_profile(
       CGColorSpaceCopyICCProfile(cg_color_space));
   if (!cf_icc_profile)
-    return gfx::ColorSpace();
+    return gfx::ICCProfile();
   size_t length = CFDataGetLength(cf_icc_profile);
   const unsigned char* data = CFDataGetBytePtr(cf_icc_profile);
   std::vector<char> vector_icc_profile;
   vector_icc_profile.assign(data, data + length);
-  return FromICCProfile(vector_icc_profile);
+  return FromData(vector_icc_profile);
 }
 
 }  // namespace gfx