Merges to M46 for:

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"
@@ skipping 88 matching lines @@
   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);
+  EXPECT_EQ(caps.image_ycbcr_422, flags.chromium_image_ycbcr_422);
   EXPECT_EQ(caps.render_buffer_format_bgra8888,
             flags.ext_render_buffer_format_bgra8888);
   EXPECT_EQ(caps.occlusion_query_boolean, flags.occlusion_query_boolean);
 }
 
 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