[Reland] Add gl tests to make sure when a buffer is unmapped, all access path generates an INVALID_…

gpu/command_buffer/service/program_manager_unittest.cc

Index: gpu/command_buffer/service/program_manager_unittest.cc
diff --git a/gpu/command_buffer/service/program_manager_unittest.cc b/gpu/command_buffer/service/program_manager_unittest.cc
index b6f19e224f866284f838e344ecdf095d86c769ea..743fe82aabbf96cdb127d68462876139a1be6538 100644
--- a/gpu/command_buffer/service/program_manager_unittest.cc
+++ b/gpu/command_buffer/service/program_manager_unittest.cc
@@ -2107,11 +2107,10 @@ class ProgramManagerWithCacheTest : public ProgramManagerTestBase {
 
   void SetProgramCached() {
     cache_->LinkedProgramCacheSuccess(
-        vertex_shader_->source(),
-        fragment_shader_->source(),
+        vertex_shader_->source(), fragment_shader_->source(),
         &program_->bind_attrib_location_map(),
-        program_->transform_feedback_varyings(),
-        program_->transform_feedback_buffer_mode());
+        program_->effective_transform_feedback_varyings(),
+        program_->effective_transform_feedback_buffer_mode());
   }
 
   void SetExpectationsForProgramCached() {
@@ -2124,14 +2123,13 @@ class ProgramManagerWithCacheTest : public ProgramManagerTestBase {
       Program* program,
       Shader* vertex_shader,
       Shader* fragment_shader) {
-    EXPECT_CALL(*cache_.get(), SaveLinkedProgram(
-        program->service_id(),
-        vertex_shader,
-        fragment_shader,
-        &program->bind_attrib_location_map(),
-        program_->transform_feedback_varyings(),
-        program_->transform_feedback_buffer_mode(),
-        _)).Times(1);
+    EXPECT_CALL(*cache_.get(),
+                SaveLinkedProgram(
+                    program->service_id(), vertex_shader, fragment_shader,
+                    &program->bind_attrib_location_map(),
+                    program_->effective_transform_feedback_varyings(),
+                    program_->effective_transform_feedback_buffer_mode(), _))
+        .Times(1);
   }
 
   void SetExpectationsForNotCachingProgram() {
@@ -2144,14 +2142,13 @@ class ProgramManagerWithCacheTest : public ProgramManagerTestBase {
       Program* program,
       Shader* vertex_shader,
       Shader* fragment_shader) {
-    EXPECT_CALL(*cache_.get(), SaveLinkedProgram(
-        program->service_id(),
-        vertex_shader,
-        fragment_shader,
-        &program->bind_attrib_location_map(),
-        program_->transform_feedback_varyings(),
-        program_->transform_feedback_buffer_mode(),
-        _)).Times(0);
+    EXPECT_CALL(*cache_.get(),
+                SaveLinkedProgram(
+                    program->service_id(), vertex_shader, fragment_shader,
+                    &program->bind_attrib_location_map(),
+                    program_->effective_transform_feedback_varyings(),
+                    program_->effective_transform_feedback_buffer_mode(), _))
+        .Times(0);
   }
 
   void SetExpectationsForProgramLoad(ProgramCache::ProgramLoadResult result) {
@@ -2169,13 +2166,11 @@ class ProgramManagerWithCacheTest : public ProgramManagerTestBase {
       Shader* fragment_shader,
       ProgramCache::ProgramLoadResult result) {
     EXPECT_CALL(*cache_.get(),
-                LoadLinkedProgram(service_program_id,
-                                  vertex_shader,
-                                  fragment_shader,
-                                  &program->bind_attrib_location_map(),
-                                  program_->transform_feedback_varyings(),
-                                  program_->transform_feedback_buffer_mode(),
-                                  _))
+                LoadLinkedProgram(
+                    service_program_id, vertex_shader, fragment_shader,
+                    &program->bind_attrib_location_map(),
+                    program_->effective_transform_feedback_varyings(),
+                    program_->effective_transform_feedback_buffer_mode(), _))
         .WillOnce(Return(result));
   }