Use separate pixel reference images for windows 10 and 7

content/test/gpu/gpu_tests/cloud_storage_integration_test_base.py

Index: content/test/gpu/gpu_tests/cloud_storage_integration_test_base.py
diff --git a/content/test/gpu/gpu_tests/cloud_storage_integration_test_base.py b/content/test/gpu/gpu_tests/cloud_storage_integration_test_base.py
index 56230326be9bfc36c0396294131f3728cf210065..c5eb2b318e20c1f06580126da22a0f7add8e92cf 100644
--- a/content/test/gpu/gpu_tests/cloud_storage_integration_test_base.py
+++ b/content/test/gpu/gpu_tests/cloud_storage_integration_test_base.py
@@ -247,9 +247,13 @@ class CloudStorageIntegrationTestBase(gpu_integration_test.GpuIntegrationTest):
     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