Merge color options into ColorBehavior

third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.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 312 matching lines @@
   m_lazyDecoder->setData(m_data, false);
   EXPECT_EQ(m_frameCount, m_lazyDecoder->frameCount());
   m_frameCount = 0;
   m_lazyDecoder->setData(m_data, true);
   EXPECT_EQ(m_frameCount, m_lazyDecoder->frameCount());
 }
 
 TEST_F(DeferredImageDecoderTest, frameOpacity) {
   std::unique_ptr<DeferredImageDecoder> decoder = DeferredImageDecoder::create(
       m_data, true, ImageDecoder::AlphaPremultiplied,
-      ImageDecoder::ColorSpaceTransformed,
-      ImageDecoder::targetColorSpaceForTesting());
+      ColorBehavior::transformToTargetForTesting());
 
   SkImageInfo pixInfo = SkImageInfo::MakeN32Premul(1, 1);
 
   size_t rowBytes = pixInfo.minRowBytes();
   size_t size = pixInfo.getSafeSize(rowBytes);
 
   Vector<char> storage(size);
   SkPixmap pixmap(pixInfo, storage.data(), rowBytes);
 
   // Before decoding, the frame is not known to be opaque.
@@ skipping 36 matching lines @@
       SharedBuffer::create(m_data->data(), m_data->size());
   EXPECT_EQ(originalData->size(), m_data->size());
   m_lazyDecoder->setData(originalData, false);
   RefPtr<SharedBuffer> newData = m_lazyDecoder->data();
   EXPECT_EQ(originalData->size(), newData->size());
   EXPECT_EQ(
       0, std::memcmp(originalData->data(), newData->data(), newData->size()));
 }
 
 }  // namespace blink