Update WebGL 2 conformance test expectations for Linux AMD bot.

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.
 
 import test_expectations
 
 ANGLE_CONDITIONS = ['d3d9', 'd3d11', 'opengl']
 
 GPU_CONDITIONS = ['amd', 'arm', 'broadcom', 'hisilicon', 'intel', 'imagination',
                   'nvidia', 'qualcomm', 'vivante']
@@ skipping 83 matching lines @@
         angle_renderer in expectation.angle_conditions)
 
     return gpu_matches and angle_matches
 
   def _GetGpuVendorString(self, gpu_info):
     if gpu_info:
       primary_gpu = gpu_info.devices[0]
       if primary_gpu:
         vendor_string = primary_gpu.vendor_string.lower()
         vendor_id = primary_gpu.vendor_id
-        if vendor_string:
-          return vendor_string.split(' ')[0]
-        elif vendor_id == 0x10DE:
+        if vendor_id == 0x10DE:
           return 'nvidia'
         elif vendor_id == 0x1002:
           return 'amd'
         elif vendor_id == 0x8086:
           return 'intel'
+        elif vendor_string:
+          return vendor_string.split(' ')[0]
     return 'unknown_gpu'
 
   def _GetGpuDeviceId(self, gpu_info):
     if gpu_info:
       primary_gpu = gpu_info.devices[0]
       if primary_gpu:
         return primary_gpu.device_id or primary_gpu.device_string
     return 0
 
   def _GetANGLERenderer(self, gpu_info):
     if gpu_info and gpu_info.aux_attributes:
       gl_renderer = gpu_info.aux_attributes.get('gl_renderer')
       if gl_renderer:
         if 'Direct3D11' in gl_renderer:
           return 'd3d11'
         elif 'Direct3D9' in gl_renderer:
           return 'd3d9'
         elif 'OpenGL' in gl_renderer:
           return 'opengl'
     return ''