Add additional info to GPU Gold data

Adds "os", "os_version", and "os_version_detail_string" to the the JSON
data that is uploaded to Gold when an image is compared. This will make
it easier to tell what bot produced an image.

Also adds "driver_version".

Example output is "win", "win10", "10.0.18362", and "26.21.14.3102"
respectively.

Bug: 1086751
Change-Id: I8a722db102808502a8100d700942a8348d2b5c54
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2218479
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#772495}

content/test/gpu/gpu_tests/skia_gold_integration_test_base.py

@@ -58,6 +58,7 @@ class _ImageParameters(object):
     self.device_string = None
     self.msaa = False
     self.model_name = None
+    self.driver_version = None
 
 
 class SkiaGoldIntegrationTestBase(gpu_integration_test.GpuIntegrationTest):
@@ -231,6 +232,7 @@ class SkiaGoldIntegrationTestBase(gpu_integration_test.GpuIntegrationTest):
                        ('disable_multisample_render_to_texture' in system_info.
                         gpu.driver_bug_workarounds))
     params.model_name = system_info.model_name
+    params.driver_version = device.driver_version
 
   @classmethod
   def _UploadBitmapToCloudStorage(cls, bucket, name, bitmap, public=False):
@@ -361,12 +363,26 @@ class SkiaGoldIntegrationTestBase(gpu_integration_test.GpuIntegrationTest):
     img_params = self.GetImageParameters(page)
     # All values need to be strings, otherwise goldctl fails.
     gpu_keys = {
-        'vendor_id': _ToHexOrNone(img_params.vendor_id),
-        'device_id': _ToHexOrNone(img_params.device_id),
-        'vendor_string': _ToNonEmptyStrOrNone(img_params.vendor_string),
-        'device_string': _ToNonEmptyStrOrNone(img_params.device_string),
-        'msaa': str(img_params.msaa),
-        'model_name': _ToNonEmptyStrOrNone(img_params.model_name),
+        'vendor_id':
+        _ToHexOrNone(img_params.vendor_id),
+        'device_id':
+        _ToHexOrNone(img_params.device_id),
+        'vendor_string':
+        _ToNonEmptyStrOrNone(img_params.vendor_string),
+        'device_string':
+        _ToNonEmptyStrOrNone(img_params.device_string),
+        'msaa':
+        str(img_params.msaa),
+        'model_name':
+        _ToNonEmptyStrOrNone(img_params.model_name),
+        'os':
+        _ToNonEmptyStrOrNone(self.browser.platform.GetOSName()),
+        'os_version':
+        _ToNonEmptyStrOrNone(self.browser.platform.GetOSVersionName()),
+        'os_version_detail_string':
+        _ToNonEmptyStrOrNone(self.browser.platform.GetOSVersionDetailString()),
+        'driver_version':
+        _ToNonEmptyStrOrNone(img_params.driver_version),
     }
     # If we have a grace period active, then the test is potentially flaky.
     # Include a pair that will cause Gold to ignore any untriaged images, which