Revert of Add more strict DCHECKs around context state.

ui/gl/gl_context.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 "ui/gl/gl_context.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/cancelable_callback.h"
@@ skipping 248 matching lines @@
     if (switched_real_contexts || !current_surface ||
         !virtual_context->IsCurrent(surface)) {
       if (!MakeCurrent(surface)) {
         return false;
       }
     }
   }
 
   DCHECK_EQ(this, GLContext::GetRealCurrent());
   DCHECK(IsCurrent(NULL));
+  DCHECK(virtual_context->IsCurrent(surface));
 
   if (switched_real_contexts || virtual_context != current_virtual_context_) {
 #if DCHECK_IS_ON()
     GLenum error = glGetError();
     // Accepting a context loss error here enables using debug mode to work on
     // context loss handling in virtual context mode.
     // There should be no other errors from the previous context leaking into
     // the new context.
     DCHECK(error == GL_NO_ERROR || error == GL_CONTEXT_LOST_KHR) <<
         "GL error was: " << error;
@@ skipping 14 matching lines @@
           (current_state && !switched_real_contexts) ? current_state : NULL);
     }
     current_virtual_context_ = virtual_context;
   }
 
   virtual_context->SetCurrent(surface);
   if (!surface->OnMakeCurrent(virtual_context)) {
     LOG(ERROR) << "Could not make GLSurface current.";
     return false;
   }
-  DCHECK(virtual_context->IsCurrent(surface));
   return true;
 }
 
 void GLContext::OnReleaseVirtuallyCurrent(GLContext* virtual_context) {
   if (current_virtual_context_ == virtual_context)
     current_virtual_context_ = nullptr;
 }
 
 void GLContext::BindGLApi() {
   SetCurrentGL(GetCurrentGL());
@@ skipping 21 matching lines @@
 
 scoped_refptr<GLContext> InitializeGLContext(scoped_refptr<GLContext> context,
                                              GLSurface* compatible_surface,
                                              const GLContextAttribs& attribs) {
   if (!context->Initialize(compatible_surface, attribs))
     return nullptr;
   return context;
 }
 
 }  // namespace gl