make --enable-hdr imply --enable-features=video-color-management

cc/output/gl_renderer.cc

Index: cc/output/gl_renderer.cc
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
index 2721a8a440270e2e01e2a87228ffbd8a1f84fb95..4c6df372759704038f04bedee6f97af1f6a110c8 100644
--- a/cc/output/gl_renderer.cc
+++ b/cc/output/gl_renderer.cc
@@ -15,6 +15,7 @@
 #include <string>
 #include <vector>
 
+#include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ -62,6 +63,7 @@
 #include "third_party/skia/include/gpu/GrContext.h"
 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"
 #include "third_party/skia/include/gpu/gl/GrGLTypes.h"
+#include "ui/display/display_switches.h"
 #include "ui/gfx/color_space.h"
 #include "ui/gfx/color_transform.h"
 #include "ui/gfx/geometry/quad_f.h"
@@ -2061,7 +2063,9 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad,
   gfx::ColorSpace src_color_space = quad->video_color_space;
   gfx::ColorSpace dst_color_space =
       current_frame()->current_render_pass->color_space;
-  if (!base::FeatureList::IsEnabled(media::kVideoColorManagement)) {
+  if (!base::FeatureList::IsEnabled(media::kVideoColorManagement) &&
+      !base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableHDR)) {

[ccameron, 2017/03/25 00:19:13]

Settings are sent to cc/ via the cc::RendererSettings structure instead of the
command line.

Couple of options here:
A: you can create a new cc::RendererSettings (following the behavior of
cc::RendererSettings::enable_color_correct_rendering)
B: you can just link off of
cc::RendererSettings::enable_color_correct_rendering, cause it'll be set by
kEnableHDR

I'd suggest B, which would end up being just:
  if (!base::FeatureList::IsEnabled(media::kVideoColorManagement) &&
      !settings_->enable_color_correct_rendering) {

[hubbe, 2017/03/27 21:35:17]

option B sounds good.

     if (!settings_->enable_color_correct_rendering)
       dst_color_space = gfx::ColorSpace();
     switch (quad->color_space) {