Enable EGLSurfaceTest on Linux

src/tests/angle_end2end_tests.gypi

@@ -51,6 +51,7 @@
             '<(angle_path)/src/tests/gl_tests/ViewportTest.cpp',
             '<(angle_path)/src/tests/egl_tests/EGLContextCompatibilityTest.cpp',
             '<(angle_path)/src/tests/egl_tests/EGLQueryContextTest.cpp',
+            '<(angle_path)/src/tests/egl_tests/EGLSurfaceTest.cpp',
             '<(angle_path)/src/tests/test_utils/ANGLETest.cpp',
             '<(angle_path)/src/tests/test_utils/ANGLETest.h',
             '<(angle_path)/src/tests/test_utils/angle_test_configs.h',
@@ -63,8 +64,6 @@
             # TODO(cwallez) for Linux, requires implementation of eglBindTexImage for pbuffers
             '<(angle_path)/src/tests/gl_tests/PbufferTest.cpp',
             '<(angle_path)/src/tests/gl_tests/QueryDisplayAttribTest.cpp',
-            # TODO(cwallez) for Linux, remove the reliance on the ANGLE_platform_angle_d3d extension
-            '<(angle_path)/src/tests/egl_tests/EGLSurfaceTest.cpp',
             # TODO(cwallez) for Linux, requires a portable implementation of threads
             '<(angle_path)/src/tests/egl_tests/EGLThreadTest.cpp',
         ],

src/tests/egl_tests/EGLSurfaceTest.cpp

@@ -7,12 +7,11 @@
 //   Tests pertaining to egl::Surface.
 //
 
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-#include <GLES2/gl2.h>
+#include <gtest/gtest.h>
+
+#include <vector>
 
 #include "OSWindow.h"
-#include "common/angleutils.h"
 #include "test_utils/ANGLETest.h"
 
 namespace
@@ -189,7 +188,7 @@ TEST_F(EGLSurfaceTest, MessageLoopBug)
     const char *extensionsString = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
     if (strstr(extensionsString, "EGL_ANGLE_platform_angle_d3d") == nullptr)
     {
-        std::cout << "D3D Platform not supported in ANGLE";
+        std::cout << "D3D Platform not supported in ANGLE" << std::endl;
         return;
     }
 
@@ -205,7 +204,7 @@ TEST_F(EGLSurfaceTest, MessageLoopBugContext)
     const char *extensionsString = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
     if (strstr(extensionsString, "EGL_ANGLE_platform_angle_d3d") == nullptr)
     {
-        std::cout << "D3D Platform not supported in ANGLE";
+        std::cout << "D3D Platform not supported in ANGLE" << std::endl;
         return;
     }
 
@@ -235,7 +234,7 @@ TEST_F(EGLSurfaceTest, ResizeD3DWindow)
     const char *extensionsString = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
     if (strstr(extensionsString, "EGL_ANGLE_platform_angle_d3d") == nullptr)
     {
-        std::cout << "D3D Platform not supported in ANGLE";
+        std::cout << "D3D Platform not supported in ANGLE" << std::endl;
         return;
     }