Bug 1031097 - Follow-up to handle llvmpipe in Android emulator GL renderer string; r=jgilbert

content/canvas/test/webgl-conformance/test_webgl_conformance_test_suite.html

@@ -111,10 +111,10 @@ function start() {
   info('GL vendor: ' + glVendor);
   info('GL renderer: ' + glRenderer);
   
-  if (glRenderer.contains('llvmpipe')) {
+  if (glRenderer.contains('Android Emulator')) {
-    kGLDriver = GLDRIVER_MESA;
-  } else if (glRenderer.contains('Android Emulator')) {
     kGLDriver = GLDRIVER_X86EMULATOR;
+  } else if (glRenderer.contains('llvmpipe')) {
+    kGLDriver = GLDRIVER_MESA;
   } else if (glVendor.contains('NVIDIA')) {
     kGLDriver = GLDRIVER_NVIDIA;
   }
@@ -532,10 +532,6 @@ function start() {
           failingTestsFilename = 'failing_tests_android_x86.txt';
           skippedTestsFilename = 'skipped_tests_android_x86.txt';
           break;
-        case GLDRIVER_MESA:
-          failingTestsFilename = 'failing_tests_android_x86.txt';
-          skippedTestsFilename = 'skipped_tests_android_x86.txt';
-          break;
         default:
           failingTestsFilename = 'failing_tests_android.txt';
           skippedTestsFilename = 'skipped_tests_android.txt';