Refactor GL bindings so there is no global GLApi or DriverGL.

gpu/command_buffer/service/gles2_cmd_decoder_passthrough.cc

 // Copyright (c) 2016 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 "gpu/command_buffer/service/gles2_cmd_decoder_passthrough.h"
 
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "ui/gl/gl_version_info.h"
 
@@ skipping 205 matching lines @@
   DeleteServiceObjects(&transform_feedback_id_map_, have_context,
                        [](GLuint transform_feedback) {
                          glDeleteTransformFeedbacks(1, &transform_feedback);
                        });
   DeleteServiceObjects(&query_id_map_, have_context,
                        [](GLuint query) { glDeleteQueries(1, &query); });
   DeleteServiceObjects(
       &vertex_array_id_map_, have_context,
       [](GLuint vertex_array) { glDeleteVertexArraysOES(1, &vertex_array); });
 
+  // Destroy the surface before the context, some surface destructors make GL
+  // calls.
+  surface_ = nullptr;
+
   if (group_) {
     group_->Destroy(this, have_context);
     group_ = nullptr;
   }
+
+  if (context_.get()) {
+    context_->ReleaseCurrent(nullptr);
+    context_ = nullptr;
+  }
 }
 
 void GLES2DecoderPassthroughImpl::SetSurface(
     const scoped_refptr<gl::GLSurface>& surface) {
   DCHECK(context_->IsCurrent(nullptr));
   DCHECK(surface_.get());
   surface_ = surface;
 }
 
 void GLES2DecoderPassthroughImpl::ReleaseSurface() {
@@ skipping 600 matching lines @@
   }, /* NOLINT */
 
 const GLES2DecoderPassthroughImpl::CommandInfo
     GLES2DecoderPassthroughImpl::command_info[] = {
         GLES2_COMMAND_LIST(GLES2_CMD_OP)};
 
 #undef GLES2_CMD_OP
 
 }  // namespace gles2
 }  // namespace gpu