Virtual context MakeCurrent tweaks.

gpu/command_buffer/service/gl_context_virtual.cc

Index: gpu/command_buffer/service/gl_context_virtual.cc
diff --git a/gpu/command_buffer/service/gl_context_virtual.cc b/gpu/command_buffer/service/gl_context_virtual.cc
index 8051e06c3b935105f84f1863a7c524fb04783183..ea507a163cc7fa87f6465c69f83fca1a1044083a 100644
--- a/gpu/command_buffer/service/gl_context_virtual.cc
+++ b/gpu/command_buffer/service/gl_context_virtual.cc
@@ -54,19 +54,15 @@ void GLContextVirtual::Destroy() {
 }
 
 bool GLContextVirtual::MakeCurrent(gfx::GLSurface* surface) {
-  // TODO(epenner): We should avoid bypassing MakeVirtuallyCurrent() below
-  // (return false or DCHECK when !decoder). To do this we must reorder
-  // tear-down in GpuCommandBufferStub::Destroy().
   if (decoder_.get())
-    shared_context_->MakeVirtuallyCurrent(this, surface);
-  else if (!IsCurrent(surface))
-    shared_context_->MakeCurrent(surface);
-  return true;
+    return shared_context_->MakeVirtuallyCurrent(this, surface);
+
+  LOG(ERROR) << "Trying to make virtual context current without decoder.";
+  return false;
 }
 
 void GLContextVirtual::ReleaseCurrent(gfx::GLSurface* surface) {
-  if (IsCurrent(surface))
-    shared_context_->ReleaseCurrent(surface);
+  shared_context_->ReleaseCurrent(surface);
 }
 
 bool GLContextVirtual::IsCurrent(gfx::GLSurface* surface) {