commit f09bf6698d58203177ec48b87b89a1845ca9d303
author Jamie Madill <jmadill@chromium.org> Wed Mar 02 11:26:01 2016 -0500
committer Jamie Madill <jmadill@chromium.org> Wed Mar 02 16:27:16 2016 +0000
tree d1a4008002746cbc4dea8c26d470537dba78edbe
parent bc21e18b8ec49ac543b8941272da36cbf79fb4cb

Revert "Suppress some failing end2end_tests on Intel."

This reverts commit 7208f6994cf7d810c2226965362aad43d2a66f53.

Still some failures on Intel, requires a slightly different solution.

BUG=589851

Change-Id: I6ac6599249e9e0f6319c917e04734cd48ca9274d
Reviewed-on: https://chromium-review.googlesource.com/329734
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/tests/test_utils/ANGLETest.cpp

diff --git a/src/tests/test_utils/ANGLETest.cpp b/src/tests/test_utils/ANGLETest.cpp
index ee14e6c..b1fb777 100644
--- a/src/tests/test_utils/ANGLETest.cpp
+++ b/src/tests/test_utils/ANGLETest.cpp
@@ -433,62 +433,58 @@
     mOSWindow->setVisible(isVisible);
 }
 
-bool IsIntel()
+bool ANGLETest::isIntel() const
 {
     std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
     return (rendererString.find("Intel") != std::string::npos);
 }
 
-bool IsAMD()
+bool ANGLETest::isAMD() const
 {
     std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
     return (rendererString.find("AMD") != std::string::npos) ||
            (rendererString.find("ATI") != std::string::npos);
 }
 
-bool IsNVIDIA()
+bool ANGLETest::isNVidia() const
 {
     std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
     return (rendererString.find("NVIDIA") != std::string::npos);
 }
 
-bool IsD3D11()
+bool ANGLETest::isD3D11() const
 {
     std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
     return (rendererString.find("Direct3D11 vs_5_0") != std::string::npos);
 }
 
-bool IsD3D11_FL93()
+bool ANGLETest::isD3D11_FL93() const
 {
     std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
     return (rendererString.find("Direct3D11 vs_4_0_") != std::string::npos);
 }
 
-bool IsD3D9()
+bool ANGLETest::isD3D9() const
 {
     std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
     return (rendererString.find("Direct3D9") != std::string::npos);
 }
 
-bool IsD3DSM3()
+bool ANGLETest::isD3DSM3() const
 {
-    return IsD3D9() || IsD3D11_FL93();
+    std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
+    return isD3D9() || isD3D11_FL93();
 }
 
-bool IsOSX()
+bool ANGLETest::isOSX() const
 {
-#if defined(__APPLE__)
+#ifdef __APPLE__
     return true;
 #else
     return false;
 #endif
 }
 
-bool ANGLETest::isOpenGL() const
-{
-    return getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE;
-}
-
 EGLint ANGLETest::getPlatformRenderer() const
 {
     assert(mEGLWindow);