Merge color options into ColorBehavior

third_party/WebKit/Source/web/WebImageDecoder.cpp

Index: third_party/WebKit/Source/web/WebImageDecoder.cpp
diff --git a/third_party/WebKit/Source/web/WebImageDecoder.cpp b/third_party/WebKit/Source/web/WebImageDecoder.cpp
index ee7877639da645ac72e38fbe84fd04f59138e13c..0c8428fed0faa9edba9da0d76749965a94f673b1 100644
--- a/third_party/WebKit/Source/web/WebImageDecoder.cpp
+++ b/third_party/WebKit/Source/web/WebImageDecoder.cpp
@@ -51,13 +51,13 @@ void WebImageDecoder::init(Type type) {
   switch (type) {
     case TypeBMP:
       m_private = new BMPImageDecoder(
-          ImageDecoder::AlphaPremultiplied, ImageDecoder::ColorSpaceTransformed,
-          ImageDecoder::targetColorSpaceForTesting(), maxDecodedBytes);
+          ImageDecoder::AlphaPremultiplied,
+          ColorBehavior::transformToTargetForTesting(), maxDecodedBytes);
       break;
     case TypeICO:
       m_private = new ICOImageDecoder(
-          ImageDecoder::AlphaPremultiplied, ImageDecoder::ColorSpaceTransformed,
-          ImageDecoder::targetColorSpaceForTesting(), maxDecodedBytes);
+          ImageDecoder::AlphaPremultiplied,
+          ColorBehavior::transformToTargetForTesting(), maxDecodedBytes);
       break;
   }
 }