Revert of Compute GpuDriverBugWorkarounds only one time in the GPU process

gpu/command_buffer/tests/gl_manager.cc

Index: gpu/command_buffer/tests/gl_manager.cc
diff --git a/gpu/command_buffer/tests/gl_manager.cc b/gpu/command_buffer/tests/gl_manager.cc
index 3c9243d9c4a1529bb47067a6a98bfe0ffe600f4a..ce9fd3ccd7f2c5f83b3c34f2109e1b95b960ee33 100644
--- a/gpu/command_buffer/tests/gl_manager.cc
+++ b/gpu/command_buffer/tests/gl_manager.cc
@@ -14,7 +14,6 @@
 
 #include "base/at_exit.h"
 #include "base/bind.h"
-#include "base/command_line.h"
 #include "base/memory/ref_counted_memory.h"
 #include "build/build_config.h"
 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
@@ -231,12 +230,11 @@
 }
 
 void GLManager::Initialize(const GLManager::Options& options) {
-  InitializeWithCommandLine(options, *base::CommandLine::ForCurrentProcess());
-}
-
-void GLManager::InitializeWithCommandLine(
-    const GLManager::Options& options,
-    const base::CommandLine& command_line) {
+  InitializeWithCommandLine(options, nullptr);
+}
+
+void GLManager::InitializeWithCommandLine(const GLManager::Options& options,
+                                          base::CommandLine* command_line) {
   const int32_t kCommandBufferSize = 1024 * 1024;
   const size_t kStartTransferBufferSize = 4 * 1024 * 1024;
   const size_t kMinTransferBufferSize = 1 * 256 * 1024;
@@ -289,10 +287,11 @@
 
   attrib_helper.Serialize(&attribs);
 
+  DCHECK(!command_line || !context_group);
   if (!context_group) {
-    GpuDriverBugWorkarounds gpu_driver_bug_workaround(&command_line);
-    scoped_refptr<gles2::FeatureInfo> feature_info =
-        new gles2::FeatureInfo(command_line, gpu_driver_bug_workaround);
+    scoped_refptr<gles2::FeatureInfo> feature_info;
+    if (command_line)
+      feature_info = new gles2::FeatureInfo(*command_line);
     context_group = new gles2::ContextGroup(
         gpu_preferences_, mailbox_manager_.get(), NULL,
         new gpu::gles2::ShaderTranslatorCache(gpu_preferences_),
@@ -464,7 +463,7 @@
   }
 }
 
-const GpuDriverBugWorkarounds& GLManager::workarounds() const {
+const gpu::gles2::FeatureInfo::Workarounds& GLManager::workarounds() const {
   return decoder_->GetContextGroup()->feature_info()->workarounds();
 }