Use separate pixel reference images for windows 10 and 7

content/test/gpu/gpu_tests/cloud_storage_integration_test_base.py

 # Copyright 2016 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.
 
 """Base classes for a test which uploads results (reference images,
 error images) to cloud storage."""
 
 import logging
 import os
 import re
@@ skipping 229 matching lines @@
         ('disable_multisample_render_to_texture' in
           system_info.gpu.driver_bug_workarounds))
     params.model_name = system_info.model_name
 
   @classmethod
   def _FormatGpuInfo(cls, tab):
     cls._ComputeGpuInfo(tab)
     params = cls._reference_image_parameters
     msaa_string = '_msaa' if params.msaa else '_non_msaa'
     if params.vendor_id:
-      return '%s_%04x_%04x%s' % (
+      base_name = '%s_%04x_%04x%s' % (
         cls.GetParsedCommandLineOptions().os_type, params.vendor_id,
         params.device_id, msaa_string)
+      if str(cls.browser.platform.GetOSVersionName()).lower() == "win10":
+        # Allow separate baselines for Windows 10 and Windows 7.
+        base_name = "win10_" + base_name

[Ken Russell (switch to Gerrit), 2017/04/01 01:18:56]

Could you add a little more logic above the assignment of base_name so that the
"win" from cls.GetParsedCommandLineOptions().os_type is replaced by "win10",
instead of "win10_win_..."? Thanks.

+      return base_name
     else:
       # This is the code path for Android devices. Include the model
       # name (e.g. "Nexus 9") in the GPU string to disambiguate
       # multiple devices on the waterfall which might have the same
       # device string ("NVIDIA Tegra") but different screen
       # resolutions and device pixel ratios.
       return '%s_%s_%s_%s%s' % (
         cls.GetParsedCommandLineOptions().os_type,
         params.vendor_string, params.device_string,
         params.model_name, msaa_string)
@@ skipping 90 matching lines @@
     except Exception:
       # An exception raised from self.fail() indicates a failure.
       image_name = self._UrlToImageName(url)
       if self.GetParsedCommandLineOptions().test_machine_name:
         self._UploadErrorImagesToCloudStorage(image_name, screenshot, None)
       else:
         self._WriteErrorImages(
           self.GetParsedCommandLineOptions().generated_dir, image_name,
           screenshot, None)
       raise