Revert of Make GL bindings conditional

gpu/command_buffer/service/gpu_tracer_unittest.cc

 // Copyright 2014 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 <map>
 #include <set>
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h"
 #include "gpu/command_buffer/service/gpu_service_test.h"
 #include "gpu/command_buffer/service/gpu_tracer.h"
@@ skipping 207 matching lines @@
 };
 
 class BaseGpuTest : public GpuServiceTest {
  public:
   BaseGpuTest(GpuTracerType test_tracer_type)
       : test_tracer_type_(test_tracer_type) {
   }
 
  protected:
   void SetUp() override {
-    const char* gl_version = "3.2";
-    const char* extensions = nullptr;
-    if (GetTracerType() == kTracerTypeDisjointTimer) {
-      gl_version = "opengl es 3.0";
-      extensions = "GL_EXT_disjoint_timer_query";
-    } else if (GetTracerType() == kTracerTypeARBTimer) {
-      // TODO(sievers): The tracer should not depend on ARB_occlusion_query.
-      // Try merge Query APIs (core, ARB, EXT) into a single binding each.
-      extensions = "GL_ARB_timer_query GL_ARB_occlusion_query";
-    }
-    GpuServiceTest::SetUpWithGLVersion(gl_version, extensions);
+    GpuServiceTest::SetUp();
     gl_fake_queries_.Reset();
     gl_surface_ = new gfx::GLSurfaceStub();
     gl_context_ = new gfx::GLContextStub();
     gl_context_->MakeCurrent(gl_surface_.get());
 
     outputter_ref_ = new MockOutputter();
     cpu_time_ref_ = new FakeCPUTime;
   }
 
   void TearDown() override {
@@ skipping 428 matching lines @@
                                    kTraceGroupMarker));
 
   ASSERT_TRUE(tracer_tester.BeginDecoding());
   EXPECT_TRUE(tracer_tester.Begin(category_name, trace_name,
                                   kTraceGroupMarker));
   ASSERT_TRUE(tracer_tester.EndDecoding());
 }
 
 }  // namespace gles2
 }  // namespace gpu