color: Enable color correct rendering on all layout tests

content/shell/app/shell_main_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/app/shell_main_delegate.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/cpu.h"
 #include "base/files/file.h"
@@ skipping 195 matching lines @@
     command_line.AppendSwitchASCII(switches::kHostResolverRules,
                                    "MAP *.test 127.0.0.1");
 
     command_line.AppendSwitch(switches::kEnablePartialRaster);
 
     if (!command_line.HasSwitch(switches::kForceGpuRasterization) &&
         !command_line.HasSwitch(switches::kEnableGpuRasterization)) {
       command_line.AppendSwitch(switches::kDisableGpuRasterization);
     }
 
-    // If the virtual test suite didn't specify a color space, then use the
-    // default layout test color space (GenericRGB for Mac and sRGB for all
-    // other platforms).
-    if (!command_line.HasSwitch(switches::kForceColorProfile)) {
-#if defined(OS_MACOSX)
-      if (command_line.HasSwitch(switches::kEnableColorCorrectRendering)) {
-        command_line.AppendSwitchASCII(switches::kForceColorProfile, "srgb");
-      } else {
-        command_line.AppendSwitchASCII(switches::kForceColorProfile,
-                                       "generic-rgb");
-      }
-#else
+    // Enable color correct rendering. If the virtual test suite didn't specify
+    // a color space, then use sRGB.
+    command_line.AppendSwitch(switches::kEnableColorCorrectRendering);
+    if (!command_line.HasSwitch(switches::kForceColorProfile))
       command_line.AppendSwitchASCII(switches::kForceColorProfile, "srgb");
-#endif
-    }
 
     // We want stable/baseline results when running layout tests.
     command_line.AppendSwitch(switches::kDisableSkiaRuntimeOpts);
 
     command_line.AppendSwitch(cc::switches::kDisallowNonExactResourceReuse);
 
     // Unless/until WebM files are added to the media layout tests, we need to
     // avoid removing MP4/H264/AAC so that layout tests can run on Android.
 #if !defined(OS_ANDROID)
     media::RemoveProprietaryMediaTypesAndCodecsForTests();
@@ skipping 150 matching lines @@
 
   return renderer_client_.get();
 }
 
 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() {
   utility_client_.reset(new ShellContentUtilityClient);
   return utility_client_.get();
 }
 
 }  // namespace content