Update from https://crrev.com/306655

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 <string>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/threading/thread_local.h"
@@ skipping 64 matching lines @@
 
 bool GLContext::GetTotalGpuMemory(size_t* bytes) {
   DCHECK(bytes);
   *bytes = 0;
   return false;
 }
 
 void GLContext::SetSafeToForceGpuSwitch() {
 }
 
+bool GLContext::ForceGpuSwitchIfNeeded() {
+  return true;
+}
+
 void GLContext::SetUnbindFboOnMakeCurrent() {
   NOTIMPLEMENTED();
 }
 
 std::string GLContext::GetExtensions() {
   DCHECK(IsCurrent(NULL));
   const char* ext = reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS));
   return std::string(ext ? ext : "");
 }
 
@@ skipping 97 matching lines @@
 void GLContext::SetupForVirtualization() {
   if (!virtual_gl_api_) {
     virtual_gl_api_.reset(new VirtualGLApi());
     virtual_gl_api_->Initialize(&g_driver_gl, this);
   }
 }
 
 bool GLContext::MakeVirtuallyCurrent(
     GLContext* virtual_context, GLSurface* surface) {
   DCHECK(virtual_gl_api_);
+  if (!ForceGpuSwitchIfNeeded())
+    return false;
   return virtual_gl_api_->MakeCurrent(virtual_context, surface);
 }
 
 void GLContext::OnReleaseVirtuallyCurrent(GLContext* virtual_context) {
   if (virtual_gl_api_)
     virtual_gl_api_->OnReleaseVirtuallyCurrent(virtual_context);
 }
 
 void GLContext::SetRealGLApi() {
   SetGLToRealGLApi();
 }
 
 void GLContext::OnFlush() {
   for (size_t n = 0; n < flush_events_.size(); n++)
     flush_events_[n]->Signal();
   flush_events_.clear();
 }
 
 GLContextReal::GLContextReal(GLShareGroup* share_group)
     : GLContext(share_group) {}
 
 GLContextReal::~GLContextReal() {}
 
 void GLContextReal::SetCurrent(GLSurface* surface) {
   GLContext::SetCurrent(surface);
   current_real_context_.Pointer()->Set(surface ? this : NULL);
 }
 
 }  // namespace gfx