Update from https://crrev.com/318214

gpu/command_buffer/service/feature_info_unittest.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 "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "gpu/command_buffer/service/gpu_service_test.h"
@@ skipping 558 matching lines @@
   EXPECT_TRUE(info_->validators()->texture_internal_format_storage.IsValid(
       GL_RGB16F_EXT));
   EXPECT_TRUE(info_->validators()->texture_internal_format_storage.IsValid(
       GL_ALPHA16F_EXT));
   EXPECT_TRUE(info_->validators()->texture_internal_format_storage.IsValid(
       GL_LUMINANCE16F_EXT));
   EXPECT_TRUE(info_->validators()->texture_internal_format_storage.IsValid(
       GL_LUMINANCE_ALPHA16F_EXT));
 }
 
-// Check how to handle ES, texture_storage and BGRA combination; 8 tests.
+// Check how to handle ES, texture_storage and BGRA combination; 10 tests.
 
 // 1- ES2 + GL_EXT_texture_storage -> GL_EXT_texture_storage (and no
 // GL_EXT_texture_format_BGRA8888 - we don't claim to handle GL_BGRA8 in
 // glTexStorage2DEXT)
 TEST_F(FeatureInfoTest, InitializeGLES2_texture_storage) {
   SetupInitExpectationsWithGLVersion(
       "GL_EXT_texture_storage", "", "OpenGL ES 2.0");
   EXPECT_THAT(info_->extensions(), HasSubstr("GL_EXT_texture_storage"));
   EXPECT_THAT(info_->extensions(),
               Not(HasSubstr("GL_EXT_texture_format_BGRA8888")));
@@ skipping 61 matching lines @@
 
 // 8- ES3 + none of the above -> GL_EXT_texture_storage (and no
 // GL_EXT_texture_format_BGRA8888 - we don't claim to handle GL_BGRA8)
 TEST_F(FeatureInfoTest, InitializeGLES3_texture_storage) {
   SetupInitExpectationsWithGLVersion("", "", "OpenGL ES 3.0");
   EXPECT_THAT(info_->extensions(), HasSubstr("GL_EXT_texture_storage"));
   EXPECT_THAT(info_->extensions(),
               Not(HasSubstr("GL_EXT_texture_format_BGRA8888")));
 }
 
+// 9- ANGLE will add the GL_CHROMIUM_renderbuffer_format_BGRA8888 extension and
+// the GL_BGRA8_EXT render buffer format.
+TEST_F(FeatureInfoTest, InitializeWithANGLE_BGRA8) {
+  SetupInitExpectationsWithGLVersion("", kGLRendererStringANGLE, "");
+  EXPECT_TRUE(info_->gl_version_info().is_angle);
+  EXPECT_THAT(info_->extensions(),
+              HasSubstr("GL_CHROMIUM_renderbuffer_format_BGRA8888"));
+  EXPECT_TRUE(info_->validators()->render_buffer_format.IsValid(GL_BGRA8_EXT));
+}
+
+// 10- vanilla opengl es means no GL_CHROMIUM_renderbuffer_format_BGRA8888
+TEST_F(FeatureInfoTest,
+       InitializeGLES2_no_CHROMIUM_renderbuffer_format_BGRA8888) {
+  SetupInitExpectationsWithGLVersion("", "", "OpenGL ES 2.0");
+  EXPECT_THAT(info_->extensions(),
+              Not(HasSubstr("GL_CHROMIUM_renderbuffer_format_BGRA8888")));
+}
+
 TEST_F(FeatureInfoTest, InitializeARB_texture_float) {
   SetupInitExpectations("GL_ARB_texture_float");
   EXPECT_TRUE(info_->feature_flags().chromium_color_buffer_float_rgba);
   EXPECT_TRUE(info_->feature_flags().chromium_color_buffer_float_rgb);
   std::string extensions = info_->extensions() + " ";
   EXPECT_THAT(extensions, HasSubstr("GL_CHROMIUM_color_buffer_float_rgb "));
   EXPECT_THAT(extensions, HasSubstr("GL_CHROMIUM_color_buffer_float_rgba"));
   EXPECT_TRUE(info_->validators()->texture_internal_format.IsValid(
       GL_RGBA32F));
   EXPECT_TRUE(info_->validators()->texture_internal_format.IsValid(
@@ skipping 800 matching lines @@
   EXPECT_FALSE(
       info_->GetTextureFormatValidator(GL_RG_EXT).IsValid(GL_HALF_FLOAT_OES));
   EXPECT_TRUE(
       info_->GetTextureFormatValidator(GL_RED_EXT).IsValid(GL_UNSIGNED_BYTE));
   EXPECT_TRUE(
       info_->GetTextureFormatValidator(GL_RG_EXT).IsValid(GL_UNSIGNED_BYTE));
 }
 
 }  // namespace gles2
 }  // namespace gpu