Force sRGB color profile on Mac for pixel tests

content/test/gpu/gpu_tests/maps_integration_test.py

 # Copyright 2017 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.
 
 import json
 import os
 import sys
 
 from gpu_tests import gpu_integration_test
 from gpu_tests import cloud_storage_integration_test_base
 from gpu_tests import maps_expectations
 from gpu_tests import path_util
+from gpu_tests import color_profile_manager
 
 from py_utils import cloud_storage
 
 data_path = os.path.join(path_util.GetChromiumSrcDir(),
                          'content', 'test', 'gpu', 'page_sets', 'data')
 
 class MapsIntegrationTest(
     cloud_storage_integration_test_base.CloudStorageIntegrationTestBase):
   """Google Maps pixel tests.
 
@@ skipping 31 matching lines @@
   @classmethod
   def Name(cls):
     return 'maps'
 
   @classmethod
   def _CreateExpectations(cls):
     return maps_expectations.MapsExpectations()
 
   @classmethod
   def SetUpProcess(cls):
+    cls._color_profile_manager = color_profile_manager.ColorProfileManager()
+    cls._color_profile_manager.ForceSRGB()
     super(MapsIntegrationTest, cls).SetUpProcess()
-    cls.CustomizeBrowserArgs([])
+    cls.CustomizeBrowserArgs(['--force-color-profile=srgb'])
     cls.StartWPRServer(os.path.join(data_path, 'maps_004.wpr.updated'),
                        cloud_storage.PUBLIC_BUCKET)
     cls.StartBrowser()
 
   @classmethod
   def TearDownProcess(cls):
     super(cls, MapsIntegrationTest).TearDownProcess()
     cls.StopWPRServer()
+    cls._color_profile_manager.Restore()

[Ken Russell (switch to Gerrit), 2017/06/20 22:55:02]

See above comment about whether this class should auto-Restore during process
teardown.

[ccameron, 2017/06/21 06:45:42]

Done -- this (and the whole method for pixel) are gone.

 
   @classmethod
   def GenerateGpuTests(cls, options):
     cls.SetParsedCommandLineOptions(options)
     yield('Maps_maps_004',
           'http://map-test/performance.html',
           ('maps_004_expectations.json'))
 
   def _ReadPixelExpectations(self, expectations_file):
     expectations_path = os.path.join(data_path, expectations_file)
@@ skipping 47 matching lines @@
     # screenshot are observed. Hack around this by specifying a scale
     # factor for these bots in the test expectations. This relies on
     # the test-machine-name argument being specified on the command
     # line.
     expected = self._ReadPixelExpectations(pixel_expectations_file)
     self._ValidateScreenshotSamples(tab, url, screenshot, expected, dpr)
 
 def load_tests(loader, tests, pattern):
   del loader, tests, pattern  # Unused.
   return gpu_integration_test.LoadAllTestsInModule(sys.modules[__name__])