Merge color options into ColorBehavior

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

Index: third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTestWoPlatform.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTestWoPlatform.cpp b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTestWoPlatform.cpp
index 578d79800ca756b587d0534d25a97983e47756e1..5540d70d11e48ebacb3b4bdea127e35f4b63c303 100644
--- a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTestWoPlatform.cpp
+++ b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTestWoPlatform.cpp
@@ -40,7 +40,7 @@ static void mixImages(const char* fileName,
       SharedBuffer::create(file->data(), bytesForFirstFrame);
   std::unique_ptr<DeferredImageDecoder> decoder = DeferredImageDecoder::create(
       partialFile, false, ImageDecoder::AlphaPremultiplied,
-      ImageDecoder::ColorSpaceIgnored, nullptr);
+      ColorBehavior::ignore());
   ASSERT_NE(decoder, nullptr);
   sk_sp<SkImage> partialImage = decoder->createFrameAtIndex(0);
 
@@ -101,7 +101,7 @@ TEST(DeferredImageDecoderTestWoPlatform, fragmentedSignature) {
     EXPECT_FALSE(ImageDecoder::hasSufficientDataToSniffImageType(*buffer));
     EXPECT_EQ(nullptr, DeferredImageDecoder::create(
                            buffer, false, ImageDecoder::AlphaPremultiplied,
-                           ImageDecoder::ColorSpaceIgnored, nullptr));
+                           ColorBehavior::ignore()));
 
     // Append the rest of the data.  We should be able to sniff the signature
     // now, even if segmented.
@@ -110,7 +110,7 @@ TEST(DeferredImageDecoderTestWoPlatform, fragmentedSignature) {
     std::unique_ptr<DeferredImageDecoder> decoder =
         DeferredImageDecoder::create(buffer, false,
                                      ImageDecoder::AlphaPremultiplied,
-                                     ImageDecoder::ColorSpaceIgnored, nullptr);
+                                     ColorBehavior::ignore());
     ASSERT_NE(decoder, nullptr);
     EXPECT_TRUE(String(testFiles[i]).endsWith(decoder->filenameExtension()));
   }