Fix GpuRasterization.BlueBox expectation.

content/test/gpu/gpu_tests/gpu_test_expectations.py

 # Copyright 2014 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.
 
 from gpu_tests import test_expectations
 
 ANGLE_CONDITIONS = ['d3d9', 'd3d11', 'opengl', 'no_angle']
 
 GPU_CONDITIONS = ['amd', 'arm', 'broadcom', 'hisilicon', 'intel', 'imagination',
                   'nvidia', 'qualcomm', 'vivante']
@@ skipping 25 matching lines @@
     Examples: ('nvidia', 0x1234), ('arm', 'Mali-T604')
     Device IDs must be paired with a GPU vendor.
 
     Sample usage in SetExpectations in subclasses:
       self.Fail('gl-enable-vertex-attrib.html',
           ['mac', 'amd', ('nvidia', 0x1234)], bug=123)
     """
     if isinstance(condition, tuple):
       c0 = condition[0].lower()
       if c0 in GPU_CONDITIONS:
-        self.device_id_conditions.append((c0, condition[1]))
+        device = condition[1]
+        if isinstance(device, str):
+          # If the device is parseable as an int, that's not allowed.
+          # It's too easy to make a mistake specifying the device ID
+          # as a string instead of an int.
+          was_int = False
+          try:
+            int(device, 0)
+            was_int = True
+          except Exception:
+            pass
+          if was_int:
+            raise ValueError(
+              'Device id %s should have been specified as an integer' %
+              condition[1])
+        self.device_id_conditions.append((c0, device))
       else:
         raise ValueError('Unknown expectation condition: "%s"' % c0)
     else:
       cl = condition.lower()
       if cl in GPU_CONDITIONS:
         self.gpu_conditions.append(cl)
       elif cl in ANGLE_CONDITIONS:
         self.angle_conditions.append(cl)
       else:
         # Delegate to superclass.
@@ skipping 70 matching lines @@
     if gpu_info and gpu_info.aux_attributes:
       gl_renderer = gpu_info.aux_attributes.get('gl_renderer')
       if gl_renderer and 'ANGLE' in gl_renderer:
         if 'Direct3D11' in gl_renderer:
           return 'd3d11'
         elif 'Direct3D9' in gl_renderer:
           return 'd3d9'
         elif 'OpenGL' in gl_renderer:
           return 'opengl'
     return 'no_angle'