Enable virtual context on IMG devices in a different way

content/common/gpu/gpu_command_buffer_stub.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.
 
 #if defined(ENABLE_GPU)
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 387 matching lines @@
   if (!surface_.get()) {
     // Ensure the decoder is not destroyed if it is not initialized.
     decoder_.reset();
 
     DLOG(ERROR) << "Failed to create surface.\n";
     OnInitializeFailed(reply_message);
     return;
   }
 
   scoped_refptr<gfx::GLContext> context;
-  if ((context_group_->feature_info()->feature_flags().enable_virtual_context ||
-      CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableVirtualGLContexts)) &&
-      channel_->share_group()) {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableVirtualGLContexts) && channel_->share_group()) {
     context = channel_->share_group()->GetSharedContext();
     if (!context) {
       context = gfx::GLContext::CreateGLContext(
           channel_->share_group(),
           channel_->gpu_channel_manager()->GetDefaultOffscreenSurface(),
           gpu_preference_);
       channel_->share_group()->SetSharedContext(context);
     }
     // This should be a non-virtual GL context.
     DCHECK(context->GetHandle());
@@ skipping 493 matching lines @@
   // made current before calling methods on the surface.
   if (!surface_ || !MakeCurrent())
     return;
   surface_->SetFrontbufferAllocation(
       allocation.browser_allocation.suggest_have_frontbuffer);
 }
 
 }  // namespace content
 
 #endif  // defined(ENABLE_GPU)