Revert of Fix EXT_draw_buffers detection on some GL ES 3 contexts

gpu/command_buffer/service/context_group.cc

Index: gpu/command_buffer/service/context_group.cc
diff --git a/gpu/command_buffer/service/context_group.cc b/gpu/command_buffer/service/context_group.cc
index 3bb365ad1496b55ef0beca28e552d325443874be..06c1882b467a2124c25ad5a7354c44a6bd8acf4f 100644
--- a/gpu/command_buffer/service/context_group.cc
+++ b/gpu/command_buffer/service/context_group.cc
@@ -120,9 +120,9 @@
 bool ContextGroup::Initialize(GLES2Decoder* decoder,
                               ContextType context_type,
                               const DisallowedFeatures& disallowed_features) {
-  bool enable_es3 = context_type == CONTEXT_TYPE_OPENGLES3 ||
-                    context_type == CONTEXT_TYPE_WEBGL2;
-  if (!gpu_preferences_.enable_es3_apis && enable_es3) {
+  if (!gpu_preferences_.enable_es3_apis &&
+      (context_type == CONTEXT_TYPE_OPENGLES3 ||
+       context_type == CONTEXT_TYPE_WEBGL2)) {
     DLOG(ERROR) << "ContextGroup::Initialize failed because ES3 APIs are "
                 << "not available.";
     return false;
@@ -170,7 +170,7 @@
     }
   }
 
-  if (enable_es3 || feature_info_->feature_flags().ext_draw_buffers) {
+  if (feature_info_->feature_flags().ext_draw_buffers) {
     GetIntegerv(GL_MAX_COLOR_ATTACHMENTS_EXT, &max_color_attachments_);
     if (max_color_attachments_ < 1)
       max_color_attachments_ = 1;