Updated expectations to account for tests that will begin failing after the conformance test harnes…

content/test/gpu/gpu_tests/webgl_conformance_expectations.py

 # Copyright (c) 2013 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 telemetry.page import test_expectations
 
 # Valid expectation conditions are:
 #
 # Operating systems:
 #     win, xp, vista, win7, mac, leopard, snowleopard, lion, mountainlion,
@@ skipping 12 matching lines @@
     # Sample Usage:
     # self.Fail('gl-enable-vertex-attrib.html',
     #     ['mac', 'amd', ('nvidia', 0x1234)], bug=123)
 
     # Windows/Intel failures
     self.Fail('conformance/textures/texture-size.html',
         ['win', 'intel'], bug=121139)
     self.Fail('conformance/rendering/gl-scissor-test.html',
         ['win', 'intel'], bug=314997)
 
-    # Windows/ATI failures
+    # Windows/AMD failures
     self.Fail('conformance/rendering/more-than-65536-indices.html',
-        ['win', 'ati'], bug=314997)
+        ['win', 'amd'], bug=314997)
 
     # Windows 7/Intel failures
     self.Fail('conformance/context/context-lost-restored.html',
         ['win7', 'intel'])
     self.Fail('conformance/context/premultiplyalpha-test.html',
         ['win7', 'intel'])
     self.Fail('conformance/extensions/oes-texture-float-with-image-data.html',
         ['win7', 'intel'])
     self.Fail('conformance/extensions/oes-texture-float.html',
         ['win7', 'intel'])
@@ skipping 103 matching lines @@
 
     # Android failures
     self.Fail('conformance/textures/texture-npot-video.html',
         ['android'], bug=306485)
     # The following test is very slow and therefore times out on Android bot.
     self.Skip('conformance/rendering/multisample-corruption.html',
         ['android'])
     self.Fail('conformance/canvas/drawingbuffer-test.html',
         ['android'], bug=314997)