Update from https://crrev.com/307330

gpu/command_buffer/service/feature_info.h

Index: gpu/command_buffer/service/feature_info.h
diff --git a/gpu/command_buffer/service/feature_info.h b/gpu/command_buffer/service/feature_info.h
index 816ab49464dfc630b8527d9a924a2e251e06bf2c..c4bf479b4d0f0e1ba00eba531d36387e7f1b9021 100644
--- a/gpu/command_buffer/service/feature_info.h
+++ b/gpu/command_buffer/service/feature_info.h
@@ -14,6 +14,7 @@
 #include "gpu/command_buffer/service/gles2_cmd_validation.h"
 #include "gpu/config/gpu_driver_bug_workaround_type.h"
 #include "gpu/gpu_export.h"
+#include "ui/gl/gl_version_info.h"
 
 namespace base {
 class CommandLine;
@@ -66,7 +67,6 @@ class GPU_EXPORT FeatureInfo : public base::RefCounted<FeatureInfo> {
     bool map_buffer_range;
     bool ext_discard_framebuffer;
     bool angle_depth_texture;
-    bool is_angle;
     bool is_swiftshader;
     bool angle_texture_usage;
     bool ext_texture_storage;
@@ -122,6 +122,11 @@ class GPU_EXPORT FeatureInfo : public base::RefCounted<FeatureInfo> {
     return workarounds_;
   }
 
+  const gfx::GLVersionInfo& gl_version_info() const {
+    CHECK(gl_version_info_.get());
+    return *(gl_version_info_.get());
+  }
+
  private:
   friend class base::RefCounted<FeatureInfo>;
   friend class BufferManagerClientSideArraysTest;
@@ -148,6 +153,8 @@ class GPU_EXPORT FeatureInfo : public base::RefCounted<FeatureInfo> {
   // Flags for Workarounds.
   Workarounds workarounds_;
 
+  scoped_ptr<gfx::GLVersionInfo> gl_version_info_;
+
   DISALLOW_COPY_AND_ASSIGN(FeatureInfo);
 };