Revert of Add gl tests to make sure when a buffer is unmapped, all access path generates an ...

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 3fb678b2d44602bf509ed67b14adc9ec84f5ce2d..196c979c4d67f398d599e2c25cbfa2884f8d1ca5 100644
--- a/gpu/command_buffer/service/program_manager_unittest.cc
+++ b/gpu/command_buffer/service/program_manager_unittest.cc
@@ -2110,10 +2110,11 @@
 
   void SetProgramCached() {
     cache_->LinkedProgramCacheSuccess(
-        vertex_shader_->source(), fragment_shader_->source(),
+        vertex_shader_->source(),
+        fragment_shader_->source(),
         &program_->bind_attrib_location_map(),
-        program_->effective_transform_feedback_varyings(),
-        program_->effective_transform_feedback_buffer_mode());
+        program_->transform_feedback_varyings(),
+        program_->transform_feedback_buffer_mode());
   }
 
   void SetExpectationsForProgramCached() {
@@ -2126,13 +2127,14 @@
       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_->effective_transform_feedback_varyings(),
-                    program_->effective_transform_feedback_buffer_mode(), _))
-        .Times(1);
+    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);
   }
 
   void SetExpectationsForNotCachingProgram() {
@@ -2145,13 +2147,14 @@
       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_->effective_transform_feedback_varyings(),
-                    program_->effective_transform_feedback_buffer_mode(), _))
-        .Times(0);
+    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);
   }
 
   void SetExpectationsForProgramLoad(ProgramCache::ProgramLoadResult result) {
@@ -2169,11 +2172,13 @@
       Shader* fragment_shader,
       ProgramCache::ProgramLoadResult result) {
     EXPECT_CALL(*cache_.get(),
-                LoadLinkedProgram(
-                    service_program_id, vertex_shader, fragment_shader,
-                    &program->bind_attrib_location_map(),
-                    program_->effective_transform_feedback_varyings(),
-                    program_->effective_transform_feedback_buffer_mode(), _))
+                LoadLinkedProgram(service_program_id,
+                                  vertex_shader,
+                                  fragment_shader,
+                                  &program->bind_attrib_location_map(),
+                                  program_->transform_feedback_varyings(),
+                                  program_->transform_feedback_buffer_mode(),
+                                  _))
         .WillOnce(Return(result));
   }