Merge color options into ColorBehavior

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 3014 matching lines @@
 
 void WebViewImpl::setZoomFactorForDeviceScaleFactor(
     float zoomFactorForDeviceScaleFactor) {
   m_zoomFactorForDeviceScaleFactor = zoomFactorForDeviceScaleFactor;
   if (!m_layerTreeView)
     return;
   setZoomLevel(m_zoomLevel);
 }
 
 void WebViewImpl::setDeviceColorProfile(const WebVector<char>& colorProfile) {
-  ImageDecoder::setGlobalTargetColorProfile(colorProfile);
+  ColorBehavior::setGlobalTargetColorProfile(colorProfile);
 }
 
 void WebViewImpl::enableAutoResizeMode(const WebSize& minSize,
                                        const WebSize& maxSize) {
   m_shouldAutoResize = true;
   m_minAutoSize = minSize;
   m_maxAutoSize = maxSize;
   configureAutoResizeMode();
 }
 
@@ skipping 1158 matching lines @@
   if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
     return nullptr;
   return focusedFrame;
 }
 
 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
   return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
 }
 
 }  // namespace blink