Merge color options into ColorBehavior

third_party/WebKit/Source/platform/graphics/ImageDecodingStoreTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 19 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include <memory>
 
 namespace blink {
 
 class ImageDecodingStoreTest : public ::testing::Test,
                                public MockImageDecoderClient {
  public:
   void SetUp() override {
     ImageDecodingStore::instance().setCacheLimitInBytes(1024 * 1024);
-    m_generator =
-        ImageFrameGenerator::create(SkISize::Make(100, 100), true,
-                                    ImageDecoder::ColorSpaceIgnored, nullptr);
+    m_generator = ImageFrameGenerator::create(SkISize::Make(100, 100), true,
+                                              ColorBehavior::ignore());
     m_decodersDestroyed = 0;
   }
 
   void TearDown() override { ImageDecodingStore::instance().clear(); }
 
   void decoderBeingDestroyed() override { ++m_decodersDestroyed; }
 
   void decodeRequested() override {
     // Decoder is never used by ImageDecodingStore.
     ASSERT_TRUE(false);
@@ skipping 115 matching lines @@
   EXPECT_TRUE(testDecoder);
   EXPECT_EQ(refDecoder, testDecoder);
   ImageDecodingStore::instance().removeDecoder(m_generator.get(), testDecoder);
   EXPECT_FALSE(ImageDecodingStore::instance().cacheEntries());
 
   EXPECT_FALSE(ImageDecodingStore::instance().lockDecoder(m_generator.get(),
                                                           size, &testDecoder));
 }
 
 }  // namespace blink