Make using virtual contexts a workaround flag rather than cmdline

content/common/gpu/gpu_command_buffer_stub.cc

Index: content/common/gpu/gpu_command_buffer_stub.cc
diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc
index e86ef017d7713ffdacf8cf1d17767f7ad5b3af86..d88f18a18d859113657cae119713cce0f17c5f02 100644
--- a/content/common/gpu/gpu_command_buffer_stub.cc
+++ b/content/common/gpu/gpu_command_buffer_stub.cc
@@ -22,7 +22,6 @@
 #include "content/common/gpu/media/gpu_video_decode_accelerator.h"
 #include "content/common/gpu/sync_point_manager.h"
 #include "content/public/common/content_client.h"
-#include "content/public/common/content_switches.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/common/mailbox.h"
@@ -151,6 +150,12 @@ GpuCommandBufferStub::GpuCommandBufferStub(
         stream_texture_manager,
         true);
   }
+
+  if (!use_virtualized_gl_context_) {
+    use_virtualized_gl_context_ = context_group_->feature_info()

[Zhenyao Mo, 2013/09/06 21:49:10]

nit: could just be "|="

+                                      ->workarounds()
+                                      .use_virtualized_gl_contexts;
+  }
 }
 
 GpuCommandBufferStub::~GpuCommandBufferStub() {
@@ -439,9 +444,7 @@ void GpuCommandBufferStub::OnInitialize(
   }
 
   scoped_refptr<gfx::GLContext> context;
-  if ((CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableVirtualGLContexts) || use_virtualized_gl_context_) &&
-      channel_->share_group()) {
+  if (use_virtualized_gl_context_ && channel_->share_group()) {
     context = channel_->share_group()->GetSharedContext();
     if (!context.get()) {
       context = gfx::GLContext::CreateGLContext(