Move ozone detection earlier in white list.

Apparently IsOzone and IsLinux can both be true at the same time. This was
confounding the config detection.

Bug: angleproject:2286
Bug: chromium:928583
Change-Id: Ifd28242f396fd97447720b0c11caf8c1590f7222
Reviewed-on: https://chromium-review.googlesource.com/c/1454319
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
diff --git a/src/tests/test_utils/angle_test_instantiate.cpp b/src/tests/test_utils/angle_test_instantiate.cpp
index f633263..1f0bde5 100644
--- a/src/tests/test_utils/angle_test_instantiate.cpp
+++ b/src/tests/test_utils/angle_test_instantiate.cpp
@@ -173,7 +173,8 @@
                 return false;
         }
     }
-    else if (IsOSX())
+
+    if (IsOSX())
     {
         // Currently we only support the OpenGL back-end on OSX.
         if (param.driver != GLESDriverType::AngleEGL)
@@ -189,7 +190,21 @@
 
         return (param.getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE);
     }
-    else if (IsLinux())
+
+    if (IsOzone())
+    {
+        // Currently we only support the GLES back-end on Ozone.
+        if (param.driver != GLESDriverType::AngleEGL)
+            return false;
+
+        // ES 3 configs do not work properly on Ozone.
+        if (param.majorVersion > 2)
+            return false;
+
+        return (param.getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE);
+    }
+
+    if (IsLinux())
     {
         // Currently we support the OpenGL and Vulkan back-ends on Linux.
         if (param.driver != GLESDriverType::AngleEGL)
@@ -207,19 +222,8 @@
                 return false;
         }
     }
-    else if (IsOzone())
-    {
-        // Currently we only support the GLES back-end on Ozone.
-        if (param.driver != GLESDriverType::AngleEGL)
-            return false;
 
-        // ES 3 configs do not work properly on Ozone.
-        if (param.majorVersion > 2)
-            return false;
-
-        return (param.getRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE);
-    }
-    else if (IsAndroid())
+    if (IsAndroid())
     {
         // Currently we support the GLES and Vulkan back-ends on Linux.
         if (param.driver != GLESDriverType::AngleEGL)
@@ -243,11 +247,9 @@
                 return false;
         }
     }
-    else
-    {
-        // Unknown platform.
-        return false;
-    }
+
+    // Unknown platform.
+    return false;
 }
 
 bool IsConfigSupported(const PlatformParameters &param)