color: Use ICCProfile from display::Display instead of FromBestMonitor

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 39 matching lines @@
 #endif
 
   // This will recover a ICCProfile from a compact ColorSpace representation.
   // Internally, this will make an effort to create an identical ICCProfile
   // to the one that created |color_space|, but this is not guaranteed.
   static ICCProfile FromColorSpace(const gfx::ColorSpace& color_space);
 
   // Create directly from profile data.
   static ICCProfile FromData(const void* icc_profile, size_t size);
 
+  // TODO(ccameron): Move this flag to display::Display, like forcing device
+  // scale factor.
+  static bool HasForcedProfile();
+  static ICCProfile GetForcedProfile();
+
   // Return a ColorSpace that references this ICCProfile. ColorTransforms
   // created using this ColorSpace will match this ICCProfile precisely.
   const ColorSpace& GetColorSpace() const;
 
   // Return a ColorSpace that is the best parametric approximation of this
   // ICCProfile. The resulting ColorSpace will reference this ICCProfile only
   // if the parametric approximation is almost exact.
   const ColorSpace& GetParametricColorSpace() const;
 
   const std::vector<char>& GetData() const;
@@ skipping 26 matching lines @@
   // false if |id| is not in the cache.
   static bool FromId(uint64_t id, ICCProfile* icc_profile);
 
   // This method is used to hard-code the |id_| to a specific value, and is
   // used by test methods to ensure that they don't conflict with the values
   // generated in the browser.
   static ICCProfile FromDataWithId(const void* icc_profile,
                                    size_t size,
                                    uint64_t id);
 
-  static bool HasForcedProfile();
-  static ICCProfile GetForcedProfile();
-
   void ComputeColorSpaceAndCache();
 
   // This globally identifies this ICC profile. It is used to look up this ICC
   // profile from a ColorSpace object created from it. The object is invalid if
   // |id_| is zero.
   uint64_t id_ = 0;
   std::vector<char> data_;
 
   // |color_space| always links back to this ICC profile, and its SkColorSpace
   // is always equal to the SkColorSpace created from this ICCProfile.
@@ skipping 10 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(SimpleColorSpace, GetColorSpace);
   friend int ::LLVMFuzzerTestOneInput(const uint8_t*, size_t);
   friend class ColorSpace;
   friend class ColorTransformInternal;
   friend struct IPC::ParamTraits<gfx::ICCProfile>;
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_ICC_PROFILE_H_