Get the proper GPU Info in GpuProcessHost

content/test/gpu/gpu_tests/gpu_process_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 logging
 import os
 import sys
 
 from gpu_tests import gpu_integration_test
 from gpu_tests import gpu_process_expectations
@@ skipping 531 matching lines @@
     # It looks like when SwiftShader is in use (via --disable-gpu),
     # that GPU information collection doesn't yet contain what's
     # expected (the system_info.gpu.aux_attributes['gl_renderer']
     # looks like it'll be null). Verified locally that we can fetch
     # the desired information via WebGL.
     renderer = self.tab.EvaluateJavaScript('gl_renderer')
     if not renderer:
       self.fail('getParameter(UNMASKED_RENDERER_WEBGL) was null')
     if 'SwiftShader' not in renderer:
       self.fail('Expected SwiftShader renderer; instead got ' + renderer)
+    if not self.browser.supports_system_info:
+      self.fail("Browser doesn't support GetSystemInfo")
+    gpu = self.browser.GetSystemInfo().gpu
+    if not gpu:
+      self.fail('Target machine must have a GPU')
+    if not gpu.aux_attributes:
+      self.fail('Browser must support GPU aux attributes')
+    if not gpu.aux_attributes['software_rendering']:
+      self.fail("Software rendering was disabled")
+    device = gpu.devices[0]
+    if not device:
+      self.fail("System Info doesn't have a device")
+    if device.vendor_id != 0:
+      self.fail("Wrong vendor ID. Expected 0, got " + hex(device.vendor_id))
+    if device.device_id != 0:
+      self.fail("Wrong device ID. Expected 0, got " + hex(device.device_id))

[Ken Russell (switch to Gerrit), 2017/03/31 22:47:11]

Great. Did these new parts fail without your patch? Hoping the answer is yes, so
they act as a regression test.

[sugoi1, 2017/04/01 02:05:40]

Yes, locally, vendor_id and device_id tests failed without the patch. I also
checked that software_rendering failed if I inverted its state when setting
use_swiftshader_.

 
 def load_tests(loader, tests, pattern):
   del loader, tests, pattern  # Unused.
   return gpu_integration_test.LoadAllTestsInModule(sys.modules[__name__])