Revert "Revert 186416"

gpu/command_buffer/service/feature_info_unittest.cc

Index: gpu/command_buffer/service/feature_info_unittest.cc
diff --git a/gpu/command_buffer/service/feature_info_unittest.cc b/gpu/command_buffer/service/feature_info_unittest.cc
index 0edaa7887c5e5138bdc184d8fa31f76d13fd1224..bf716fff695bbd8a6adad3a37f9b0253fd254d1c 100644
--- a/gpu/command_buffer/service/feature_info_unittest.cc
+++ b/gpu/command_buffer/service/feature_info_unittest.cc
@@ -95,6 +95,7 @@ TEST_F(FeatureInfoTest, Basic) {
   EXPECT_FALSE(info_->workarounds().clear_alpha_in_readpixels);
   EXPECT_EQ(0, info_->workarounds().max_texture_size);
   EXPECT_EQ(0, info_->workarounds().max_cube_map_texture_size);
+  EXPECT_FALSE(info_->workarounds().use_client_side_arrays_for_stream_buffers);
 
   // Test good types.
   {
@@ -799,5 +800,35 @@ TEST_F(FeatureInfoTest, InitializeOES_element_index_uint) {
   EXPECT_TRUE(info_->validators()->index_type.IsValid(GL_UNSIGNED_INT));
 }
 
+TEST_F(FeatureInfoTest, InitializeARM) {
+  SetupInitExpectationsWithVendor("", "ARM", "MAli-T604");
+  info_->Initialize(NULL);
+  EXPECT_TRUE(info_->workarounds().use_client_side_arrays_for_stream_buffers);
+}
+
+TEST_F(FeatureInfoTest, InitializeImagination) {
+  SetupInitExpectationsWithVendor(
+      "", "Imagination Techologies", "PowerVR SGX 540");
+  info_->Initialize(NULL);
+  EXPECT_TRUE(info_->workarounds().use_client_side_arrays_for_stream_buffers);
+  EXPECT_FALSE(info_->feature_flags().native_vertex_array_object);
+}
+
+TEST_F(FeatureInfoTest, InitializeARMVAOs) {
+  SetupInitExpectationsWithVendor(
+      "GL_OES_vertex_array_object", "ARM", "MAli-T604");
+  info_->Initialize(NULL);
+  EXPECT_TRUE(info_->workarounds().use_client_side_arrays_for_stream_buffers);
+  EXPECT_FALSE(info_->feature_flags().native_vertex_array_object);
+}
+
+TEST_F(FeatureInfoTest, InitializeImaginationVAOs) {
+  SetupInitExpectationsWithVendor(
+      "GL_OES_vertex_array_object",
+      "Imagination Techologies", "PowerVR SGX 540");
+  info_->Initialize(NULL);
+  EXPECT_TRUE(info_->workarounds().use_client_side_arrays_for_stream_buffers);
+}
+
 }  // namespace gles2
 }  // namespace gpu