Revert of Support for custom primaries

ui/gfx/color_transform_unittest.cc

 // Copyright (c) 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.
 
 #include "base/logging.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/color_space.h"
 #include "ui/gfx/color_transform.h"
 #include "ui/gfx/icc_profile.h"
 #include "ui/gfx/transform.h"
@@ skipping 41 matching lines @@
     ColorSpace::MatrixID::YDZDX,
 };
 
 ColorSpace::RangeID all_ranges[] = {ColorSpace::RangeID::FULL,
                                     ColorSpace::RangeID::LIMITED};
 
 TEST(SimpleColorSpace, BT709toSRGB) {
   ColorSpace bt709 = ColorSpace::CreateREC709();
   ColorSpace sRGB = ColorSpace::CreateSRGB();
   std::unique_ptr<ColorTransform> t(ColorTransform::NewColorTransform(
-      bt709, sRGB, ColorTransform::Intent::INTENT_ABSOLUTE));
+      bt709, sRGB, ColorTransform::Intent::ABSOLUTE));
 
   ColorTransform::TriStim tmp(16.0f / 255.0f, 0.5f, 0.5f);
   t->transform(&tmp, 1);
   EXPECT_NEAR(tmp.x(), 0.0f, 0.001f);
   EXPECT_NEAR(tmp.y(), 0.0f, 0.001f);
   EXPECT_NEAR(tmp.z(), 0.0f, 0.001f);
 
   tmp = ColorTransform::TriStim(235.0f / 255.0f, 0.5f, 0.5f);
   t->transform(&tmp, 1);
   EXPECT_NEAR(tmp.x(), 1.0f, 0.001f);
@@ skipping 263 matching lines @@
     0x00, 0x00, 0x07, 0x94, 0x00, 0x00, 0xfd, 0x8f, 0xff, 0xff, 0xfb, 0xa1,
     0xff, 0xff, 0xfd, 0xa2, 0x00, 0x00, 0x03, 0xdb, 0x00, 0x00, 0xc0, 0x75};
 
 TEST(SimpleColorSpace, BT709toSRGBICC) {
   ICCProfile srgb_icc = ICCProfile::FromData(
       reinterpret_cast<char*>(srgb_icc_data), arraysize(srgb_icc_data));
 
   ColorSpace bt709 = ColorSpace::CreateREC709();
   ColorSpace sRGB = srgb_icc.GetColorSpace();
   std::unique_ptr<ColorTransform> t(ColorTransform::NewColorTransform(
-      bt709, sRGB, ColorTransform::Intent::INTENT_ABSOLUTE));
+      bt709, sRGB, ColorTransform::Intent::ABSOLUTE));
 
   ColorTransform::TriStim tmp(16.0f / 255.0f, 0.5f, 0.5f);
   t->transform(&tmp, 1);
   EXPECT_NEAR(tmp.x(), 0.0f, 0.001f);
   EXPECT_NEAR(tmp.y(), 0.0f, 0.001f);
   EXPECT_NEAR(tmp.z(), 0.0f, 0.001f);
 
   tmp = ColorTransform::TriStim(235.0f / 255.0f, 0.5f, 0.5f);
   t->transform(&tmp, 1);
   EXPECT_NEAR(tmp.x(), 1.0f, 0.001f);
   EXPECT_NEAR(tmp.y(), 1.0f, 0.001f);
   EXPECT_NEAR(tmp.z(), 1.0f, 0.001f);
 
   // Test a blue color
   tmp = ColorTransform::TriStim(128.0f / 255.0f, 240.0f / 255.0f, 0.5f);
   t->transform(&tmp, 1);
   EXPECT_GT(tmp.z(), tmp.x());
   EXPECT_GT(tmp.z(), tmp.y());
 }
 
-TEST(SimpleColorSpace, GetColorSpace) {
-  ICCProfile srgb_icc = ICCProfile::FromData(
-      reinterpret_cast<char*>(srgb_icc_data), arraysize(srgb_icc_data));
-  ColorSpace sRGB = srgb_icc.GetColorSpace();
-  ColorSpace sRGB2 = sRGB;
-
-  // Prevent sRGB2 from using a cached ICC profile.
-  sRGB2.icc_profile_id_ = 0;
-
-  std::unique_ptr<ColorTransform> t(ColorTransform::NewColorTransform(
-      sRGB, sRGB2, ColorTransform::Intent::INTENT_ABSOLUTE));
-
-  ColorTransform::TriStim tmp(1.0f, 1.0f, 1.0f);
-  t->transform(&tmp, 1);
-  EXPECT_NEAR(tmp.x(), 1.0f, 0.001f);
-  EXPECT_NEAR(tmp.y(), 1.0f, 0.001f);
-  EXPECT_NEAR(tmp.z(), 1.0f, 0.001f);
-
-  tmp = ColorTransform::TriStim(1.0f, 0.0f, 0.0f);
-  t->transform(&tmp, 1);
-  EXPECT_NEAR(tmp.x(), 1.0f, 0.001f);
-  EXPECT_NEAR(tmp.y(), 0.0f, 0.001f);
-  EXPECT_NEAR(tmp.z(), 0.0f, 0.001f);
-
-  tmp = ColorTransform::TriStim(0.0f, 1.0f, 0.0f);
-  t->transform(&tmp, 1);
-  EXPECT_NEAR(tmp.x(), 0.0f, 0.001f);
-  EXPECT_NEAR(tmp.y(), 1.0f, 0.001f);
-  EXPECT_NEAR(tmp.z(), 0.0f, 0.001f);
-
-  tmp = ColorTransform::TriStim(0.0f, 0.0f, 1.0f);
-  t->transform(&tmp, 1);
-  EXPECT_NEAR(tmp.x(), 0.0f, 0.001f);
-  EXPECT_NEAR(tmp.y(), 0.0f, 0.001f);
-  EXPECT_NEAR(tmp.z(), 1.0f, 0.001f);
-}
-
 TEST(SimpleColorSpace, UnknownToSRGB) {
   ColorSpace unknown;
   ColorSpace sRGB = ColorSpace::CreateSRGB();
   std::unique_ptr<ColorTransform> t(ColorTransform::NewColorTransform(
-      unknown, sRGB, ColorTransform::Intent::INTENT_PERCEPTUAL));
+      unknown, sRGB, ColorTransform::Intent::PERCEPTUAL));
 
   ColorTransform::TriStim tmp(16.0f / 255.0f, 0.5f, 0.5f);
   t->transform(&tmp, 1);
   EXPECT_NEAR(tmp.x(), 0.0f, 0.001f);
   EXPECT_NEAR(tmp.y(), 0.0f, 0.001f);
   EXPECT_NEAR(tmp.z(), 0.0f, 0.001f);
 
   tmp = ColorTransform::TriStim(235.0f / 255.0f, 0.5f, 0.5f);
   t->transform(&tmp, 1);
   EXPECT_NEAR(tmp.x(), 1.0f, 0.001f);
@@ skipping 58 matching lines @@
                      std::tr1::get<1>(GetParam()),
                      std::tr1::get<2>(GetParam()),
                      std::tr1::get<3>(GetParam())) {}
 
  protected:
   ColorSpace color_space_;
 };
 
 TEST_P(ColorSpaceTest, testNullTransform) {
   std::unique_ptr<ColorTransform> t(ColorTransform::NewColorTransform(
-      color_space_, color_space_, ColorTransform::Intent::INTENT_ABSOLUTE));
+      color_space_, color_space_, ColorTransform::Intent::ABSOLUTE));
   ColorTransform::TriStim tristim(0.4f, 0.5f, 0.6f);
   t->transform(&tristim, 1);
   EXPECT_NEAR(tristim.x(), 0.4f, 0.001f);
   EXPECT_NEAR(tristim.y(), 0.5f, 0.001f);
   EXPECT_NEAR(tristim.z(), 0.6f, 0.001f);
 }
 
 TEST_P(ColorSpaceTest, toXYZandBack) {
   std::unique_ptr<ColorTransform> t1(ColorTransform::NewColorTransform(
       color_space_, ColorSpace::CreateXYZD50(),
-      ColorTransform::Intent::INTENT_ABSOLUTE));
+      ColorTransform::Intent::ABSOLUTE));
   std::unique_ptr<ColorTransform> t2(ColorTransform::NewColorTransform(
       ColorSpace::CreateXYZD50(), color_space_,
-      ColorTransform::Intent::INTENT_ABSOLUTE));
+      ColorTransform::Intent::ABSOLUTE));
   ColorTransform::TriStim tristim(0.4f, 0.5f, 0.6f);
   t1->transform(&tristim, 1);
   t2->transform(&tristim, 1);
   EXPECT_NEAR(tristim.x(), 0.4f, 0.001f);
   EXPECT_NEAR(tristim.y(), 0.5f, 0.001f);
   EXPECT_NEAR(tristim.z(), 0.6f, 0.001f);
 }
 
 INSTANTIATE_TEST_CASE_P(
     A,
@@ skipping 12 matching lines @@
                      testing::ValuesIn(all_ranges)));
 
 INSTANTIATE_TEST_CASE_P(
     C,
     ColorSpaceTest,
     testing::Combine(testing::ValuesIn(all_primaries),
                      testing::Values(ColorSpace::TransferID::BT709),
                      testing::ValuesIn(all_matrices),
                      testing::ValuesIn(all_ranges)));
 }  // namespace