Revert of Refactor context creation parameters into a struct.

gpu/command_buffer/service/feature_info.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.
 
 #include "gpu/command_buffer/service/feature_info.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <vector>
@@ skipping 1387 matching lines @@
     // but we emulate ES 3.0 on top of Desktop GL 4.2+.
     feature_flags_.emulate_primitive_restart_fixed_index = true;
   }
 
   feature_flags_.angle_robust_client_memory =
       extensions.Contains("GL_ANGLE_robust_client_memory");
 
   feature_flags_.khr_debug = gl_version_info_->IsAtLeastGL(4, 3) ||
                              gl_version_info_->IsAtLeastGLES(3, 2) ||
                              extensions.Contains("GL_KHR_debug");
-
-  feature_flags_.chromium_bind_generates_resource =
-      extensions.Contains("GL_CHROMIUM_bind_generates_resource");
-  feature_flags_.angle_webgl_compatibility =
-      extensions.Contains("GL_ANGLE_webgl_compatibility");
 }
 
 bool FeatureInfo::IsES3Capable() const {
   if (workarounds_.disable_texture_storage)
     return false;
   if (gl_version_info_)
     return gl_version_info_->is_es3_capable;
   return false;
 }
 
@@ skipping 64 matching lines @@
   if (feature_flags_.ext_texture_format_bgra8888) {
     validators_.texture_internal_format.AddValue(GL_BGRA8_EXT);
     validators_.texture_sized_color_renderable_internal_format.AddValue(
         GL_BGRA8_EXT);
     validators_.texture_sized_texture_filterable_internal_format.AddValue(
         GL_BGRA8_EXT);
   }
 }
 
 bool FeatureInfo::IsWebGLContext() const {
-  return IsWebGLContextType(context_type_);
+  // Switch statement to cause a compile-time error if we miss a case.
+  switch (context_type_) {
+    case CONTEXT_TYPE_WEBGL1:
+    case CONTEXT_TYPE_WEBGL2:
+      return true;
+    case CONTEXT_TYPE_OPENGLES2:
+    case CONTEXT_TYPE_OPENGLES3:
+      return false;
+  }
+
+  NOTREACHED();
+  return false;
 }
 
 bool FeatureInfo::IsWebGL1OrES2Context() const {
   // Switch statement to cause a compile-time error if we miss a case.
   switch (context_type_) {
     case CONTEXT_TYPE_WEBGL1:
     case CONTEXT_TYPE_OPENGLES2:
       return true;
     case CONTEXT_TYPE_WEBGL2:
     case CONTEXT_TYPE_OPENGLES3:
@@ skipping 31 matching lines @@
   if (pos == std::string::npos) {
     extensions_ += (extensions_.empty() ? "" : " ") + str;
   }
 }
 
 FeatureInfo::~FeatureInfo() {
 }
 
 }  // namespace gles2
 }  // namespace gpu