gpu: Use workarounds to selectively enable CMAA

gpu/command_buffer/service/feature_info.cc

Index: gpu/command_buffer/service/feature_info.cc
diff --git a/gpu/command_buffer/service/feature_info.cc b/gpu/command_buffer/service/feature_info.cc
index 451dea08285e04e3aa95161324497a80ebbcfc95..dafa6caccd71a3c2772943f7ecc79212d51b26f4 100644
--- a/gpu/command_buffer/service/feature_info.cc
+++ b/gpu/command_buffer/service/feature_info.cc
@@ -181,9 +181,6 @@ void FeatureInfo::InitializeBasicState(const base::CommandLine* command_line) {
   disable_shader_translator_ =
       command_line->HasSwitch(switches::kDisableGLSLTranslator);
 
-  enable_cmaa_shaders_switch_ =
-      command_line->HasSwitch(switches::kEnableCMAAShaders);
-
   unsafe_es3_apis_enabled_ = false;
 
   // Default context_type_ to a GLES2 Context.
@@ -892,7 +889,7 @@ void FeatureInfo::InitializeFeatures() {
   if (extensions.Contains("GL_INTEL_framebuffer_CMAA")) {
     feature_flags_.chromium_screen_space_antialiasing = true;
     AddExtensionString("GL_CHROMIUM_screen_space_antialiasing");
-  } else if (enable_cmaa_shaders_switch_ &&
+  } else if (!workarounds_.disable_framebuffer_cmaa &&
              (gl_version_info_->IsAtLeastGLES(3, 1) ||
               (gl_version_info_->IsAtLeastGL(3, 0) &&
                extensions.Contains("GL_ARB_shading_language_420pack") &&