Layout tests: Parameterize color space to use by default

content/shell/renderer/layout_test/layout_test_content_renderer_client.cc

Index: content/shell/renderer/layout_test/layout_test_content_renderer_client.cc
diff --git a/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc b/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc
index de021a50026b45a10cde7fc8ef1452dfcc92c4e4..3e2cb1ad0bea753cbde6a57b6e5c090259fb9262 100644
--- a/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc
+++ b/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc
@@ -232,10 +232,11 @@ LayoutTestContentRendererClient::GetImageDecodeColorProfile() {
   // TODO(ccameron): Make all platforms use the same color profile for layout
   // tests.
 #if defined(OS_WIN)
-  return nullptr;
+  return base::WrapUnique(new gfx::ICCProfile(
+      GetTestingICCProfile("sRGB")));
 #elif defined(OS_MACOSX)
-  return base::WrapUnique(new gfx::ICCProfile(gfx::ICCProfile::FromCGColorSpace(
-      CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB))));
+  return base::WrapUnique(new gfx::ICCProfile(
+      GetTestingICCProfile("genericRGB")));
 #else
   return base::WrapUnique(new gfx::ICCProfile());
 #endif