Merge branch 'ANGLE-rollback'

This resolves #624

Note: Cherry-picked some fixes on top of the ANGLE version that we want to keep.

1 files changed, 4 insertions, 4 deletions

diff --git a/gfx/angle/src/tests/angle_unittests_main.cpp b/gfx/angle/src/tests/angle_unittests_main.cpp
index 1b44dbbcc..c52df1487 100755
--- a/gfx/angle/src/tests/angle_unittests_main.cpp
+++ b/gfx/angle/src/tests/angle_unittests_main.cpp
@@ -10,17 +10,17 @@
 class CompilerTestEnvironment : public testing::Environment
 {
   public:
-    void SetUp() override
+    virtual void SetUp()
     {
-        if (!sh::Initialize())
+        if (!ShInitialize())
         {
             FAIL() << "Failed to initialize the compiler.";
         }
     }
 
-    void TearDown() override
+    virtual void TearDown()
     {
-        if (!sh::Finalize())
+        if (!ShFinalize())
         {
             FAIL() << "Failed to finalize the compiler.";
         }