Revert of Move static GL binding initialization to //ui/gl/init.

ui/gl/gpu_timing_unittest.cc

 // Copyright 2015 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 "ui/gl/gpu_timing.h"
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/bind.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_context_stub_with_extensions.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_mock.h"
 #include "ui/gl/gl_surface_stub.h"
 #include "ui/gl/gpu_preference.h"
 #include "ui/gl/gpu_timing_fake.h"
-#include "ui/gl/init/gl_factory.h"
 #include "ui/gl/test/gl_surface_test_support.h"
 
 namespace gl {
 
 using ::testing::Exactly;
 using ::testing::NotNull;
 using ::testing::DoAll;
 using ::testing::Return;
 using ::testing::SetArgPointee;
 
 class GPUTimingTest : public testing::Test {
  public:
   void SetUp() override {
     setup_ = false;
     cpu_time_bounded_ = false;
   }
 
   void TearDown() override {
     context_ = nullptr;
     surface_ = nullptr;
     if (setup_) {
       MockGLInterface::SetGLInterface(NULL);
-      init::ClearGLBindings();
+      ClearGLBindings();
     }
     setup_ = false;
     cpu_time_bounded_ = false;
     gl_.reset();
     gpu_timing_fake_queries_.Reset();
   }
 
   void SetupGLContext(const char* gl_version, const char* gl_extensions) {
     ASSERT_FALSE(setup_) << "Cannot setup GL context twice.";
     SetGLGetProcAddressProc(MockGLInterface::GetGLProcAddress);
@@ skipping 156 matching lines @@
 
   int64_t start, end;
   gpu_timer->GetStartEndTimestamps(&start, &end);
   // Force time elapsed won't be set until a query is actually attempted
   ASSERT_TRUE(client->IsForceTimeElapsedQuery());
   EXPECT_EQ(begin_cpu_time, start);
   EXPECT_EQ(begin_cpu_time, end);
 }
 
 }  // namespace gl