Update from https://crrev.com/309415

gpu/angle_end2end_tests_main.cc

Index: gpu/angle_end2end_tests_main.cc
diff --git a/gpu/angle_unittest_main.cc b/gpu/angle_end2end_tests_main.cc
similarity index 84%
copy from gpu/angle_unittest_main.cc
copy to gpu/angle_end2end_tests_main.cc
index e7667f635cdeffb5274b7727f88b5906e875a794..a611a7c0842c019a26263bc7ae96d9da3ca7e020 100644
--- a/gpu/angle_unittest_main.cc
+++ b/gpu/angle_end2end_tests_main.cc
@@ -10,12 +10,12 @@
 #include "base/test/test_suite.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/angle/include/GLSLANG/ShaderLang.h"
+#include "third_party/angle/tests/angle_tests/ANGLETest.h"
 
 namespace {
 
 int RunHelper(base::TestSuite* test_suite) {
-  base::MessageLoopForIO message_loop;
+  base::MessageLoop message_loop;
   return test_suite->Run();
 }
 
@@ -24,12 +24,11 @@ int RunHelper(base::TestSuite* test_suite) {
 int main(int argc, char** argv) {
   CommandLine::Init(argc, argv);
   testing::InitGoogleMock(&argc, argv);
-  ShInitialize();
+  testing::AddGlobalTestEnvironment(new ANGLETestEnvironment());
   base::TestSuite test_suite(argc, argv);
   int rt = base::LaunchUnitTestsSerially(
       argc,
       argv,
       base::Bind(&RunHelper, base::Unretained(&test_suite)));
-  ShFinalize();
   return rt;
 }