Update from https://crrev.com/306655

gpu/command_buffer/tests/gl_unittest.cc

 // Copyright 2014 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 <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 
+#include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/tests/gl_manager.h"
 #include "gpu/command_buffer/tests/gl_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gpu {
 
 class GLTest : public testing::Test {
  protected:
   void SetUp() override { gl_.Initialize(GLManager::Options()); }
@@ skipping 63 matching lines @@
 
   uint8 expected_clear[] = { 127, 0, 255, 0, };
   glClearColor(0.5f, 0.0f, 1.0f, 0.0f);
   glClear(GL_COLOR_BUFFER_BIT);
   EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, 1, 1, 1, expected_clear));
   uint8 expected_draw[] = { 0, 255, 0, 255, };
   glDrawArrays(GL_TRIANGLES, 0, 6);
   EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, 1, 1, 0, expected_draw));
 }
 
+TEST_F(GLTest, FeatureFlagsMatchCapabilities) {
+  scoped_refptr<gles2::FeatureInfo> features = new gles2::FeatureInfo;
+  EXPECT_TRUE(features->Initialize());
+  const auto& caps = gl_.GetCapabilities();
+  const auto& flags = features->feature_flags();
+  EXPECT_EQ(caps.egl_image_external, flags.oes_egl_image_external);
+  EXPECT_EQ(caps.texture_format_bgra8888, flags.ext_texture_format_bgra8888);
+  EXPECT_EQ(caps.texture_format_etc1, flags.oes_compressed_etc1_rgb8_texture);
+  EXPECT_EQ(caps.texture_rectangle, flags.arb_texture_rectangle);
+  EXPECT_EQ(caps.texture_usage, flags.angle_texture_usage);
+  EXPECT_EQ(caps.texture_storage, flags.ext_texture_storage);
+  EXPECT_EQ(caps.discard_framebuffer, flags.ext_discard_framebuffer);
+  EXPECT_EQ(caps.sync_query, flags.chromium_sync_query);
+  EXPECT_EQ(caps.blend_equation_advanced, flags.blend_equation_advanced);
+  EXPECT_EQ(caps.blend_equation_advanced_coherent,
+            flags.blend_equation_advanced_coherent);
+  EXPECT_EQ(caps.texture_rg, flags.ext_texture_rg);
+}
+
 TEST_F(GLTest, GetString) {
   EXPECT_STREQ(
       "OpenGL ES 2.0 Chromium",
       reinterpret_cast<const char*>(glGetString(GL_VERSION)));
   EXPECT_STREQ(
       "OpenGL ES GLSL ES 1.0 Chromium",
       reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION)));
   EXPECT_STREQ(
       "Chromium",
       reinterpret_cast<const char*>(glGetString(GL_RENDERER)));
   EXPECT_STREQ(
       "Chromium",
       reinterpret_cast<const char*>(glGetString(GL_VENDOR)));
 }
 
 }  // namespace gpu