Revert of command_buffer_gles2: Implement EGL default Display as a global object

gpu/command_buffer/tests/command_buffer_gles2_tests_main.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
+#include "gpu/gles2_conform_support/egl/test_support.h"
 #include "testing/gmock/include/gmock/gmock.h"
-#include "gpu/gles2_conform_support/egl/test_support.h"  // NOLINT
 
 // This file implements the main entry point for tests for command_buffer_gles2,
 // the mode of command buffer where the code is compiled as a standalone dynamic
 // library and exposed through EGL API.
 namespace {
 
 int RunHelper(base::TestSuite* testSuite) {
 #if defined(USE_OZONE)
   base::MessageLoopForUI main_loop;
 #else
@@ skipping 34 matching lines @@
 #endif
 
   base::TestSuite test_suite(argc, argv);
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool pool;
 #endif
   testing::InitGoogleMock(&argc, argv);
   return base::LaunchUnitTestsSerially(
       argc, argv, base::Bind(&RunHelper, base::Unretained(&test_suite)));
 }