Merge color options into ColorBehavior

third_party/WebKit/Source/platform/graphics/ImageFrameGeneratorTest.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 41 matching lines @@
                            kOpaque_SkAlphaType);
 }
 
 }  // namespace
 
 class ImageFrameGeneratorTest : public ::testing::Test,
                                 public MockImageDecoderClient {
  public:
   void SetUp() override {
     ImageDecodingStore::instance().setCacheLimitInBytes(1024 * 1024);
-    m_generator = ImageFrameGenerator::create(
-        fullSize(), false, ImageDecoder::ColorSpaceIgnored, nullptr);
+    m_generator =
+        ImageFrameGenerator::create(fullSize(), false, ColorBehavior::ignore());
     m_data = SharedBuffer::create();
     m_segmentReader = SegmentReader::createFromSharedBuffer(m_data);
     useMockImageDecoderFactory();
     m_decodersDestroyed = 0;
     m_decodeRequestCount = 0;
     m_status = ImageFrame::FrameEmpty;
     m_frameCount = 1;
     m_requestedClearExceptFrame = kNotFound;
   }
 
@@ skipping 30 matching lines @@
   void setFrameStatus(ImageFrame::Status status) {
     m_status = m_nextFrameStatus = status;
   }
   void setNextFrameStatus(ImageFrame::Status status) {
     m_nextFrameStatus = status;
   }
   void setFrameCount(size_t count) {
     m_frameCount = count;
     if (count > 1) {
       m_generator.clear();
-      m_generator = ImageFrameGenerator::create(
-          fullSize(), true, ImageDecoder::ColorSpaceIgnored, nullptr);
+      m_generator = ImageFrameGenerator::create(fullSize(), true,
+                                                ColorBehavior::ignore());
       useMockImageDecoderFactory();
     }
   }
 
   RefPtr<SharedBuffer> m_data;
   RefPtr<SegmentReader> m_segmentReader;
   RefPtr<ImageFrameGenerator> m_generator;
   int m_decodersDestroyed;
   int m_decodeRequestCount;
   ImageFrame::Status m_status;
@@ skipping 128 matching lines @@
   // all the frame data, but not destroying the decoder.  See comments in
   // ImageFrameGenerator::tryToResumeDecode().
   m_generator->decodeAndScale(m_segmentReader.get(), true, 2, imageInfo(),
                               buffer, 100 * 4);
   EXPECT_EQ(3, m_decodeRequestCount);
   EXPECT_EQ(0, m_decodersDestroyed);
   EXPECT_EQ(kNotFound, m_requestedClearExceptFrame);
 }
 
 }  // namespace blink