Cleanup GrGLInterface factories in Chromium in order to remove old names and workaround code in Ski…

cc/test/test_in_process_context_provider.cc

 // Copyright 2013 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 "cc/test/test_in_process_context_provider.h"
 
 #include "base/lazy_instance.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/gl_in_process_context.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
@@ skipping 67 matching lines @@
 
 static base::LazyInstance<GLES2Initializer> g_gles2_initializer =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 static void BindGrContextCallback(const GrGLInterface* interface) {
   TestInProcessContextProvider* context_provider =
       reinterpret_cast<TestInProcessContextProvider*>(interface->fCallbackData);
 
-  // Make sure the gles2 library is initialized first on exactly one thread.
-  g_gles2_initializer.Get();
   gles2::SetGLContext(context_provider->ContextGL());
 }
 
 class GrContext* TestInProcessContextProvider::GrContext() {
   if (gr_context_)
     return gr_context_.get();
 
+  // The GrGLInterface factory will make GL calls using the C GLES2 interface.
+  // Make sure the gles2 library is initialized first on exactly one thread.
+  g_gles2_initializer.Get();
+  gles2::SetGLContext(ContextGL());
+
   skia::RefPtr<GrGLInterface> interface =
       skia::AdoptRef(skia_bindings::CreateCommandBufferSkiaGLBinding());
   interface->fCallback = BindGrContextCallback;
   interface->fCallbackData = reinterpret_cast<GrGLInterfaceCallbackData>(this);
 
   gr_context_ = skia::AdoptRef(GrContext::Create(
       kOpenGL_GrBackend, reinterpret_cast<GrBackendContext>(interface.get())));
 
   return gr_context_.get();
 }
 
 ContextProvider::Capabilities
 TestInProcessContextProvider::ContextCapabilities() {
   return ContextProvider::Capabilities();
 }
 
 bool TestInProcessContextProvider::IsContextLost() { return false; }
 
 void TestInProcessContextProvider::VerifyContexts() {}
 
 bool TestInProcessContextProvider::DestroyedOnMainThread() { return false; }
 
 void TestInProcessContextProvider::SetLostContextCallback(
     const LostContextCallback& lost_context_callback) {}
 
 void TestInProcessContextProvider::SetMemoryPolicyChangedCallback(
     const MemoryPolicyChangedCallback& memory_policy_changed_callback) {}
 
 }  // namespace cc