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

 // 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/program_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 2092 matching lines @@
     ProgramManagerTestBase::TearDown();
   }
 
   void SetShadersCompiled() {
     TestHelper::SetShaderStates(gl_.get(), vertex_shader_, true);
     TestHelper::SetShaderStates(gl_.get(), fragment_shader_, true);
   }
 
   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() {
     SetExpectationsForProgramCached(program_,
                                     vertex_shader_,
                                     fragment_shader_);
   }
 
   void SetExpectationsForProgramCached(
       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() {
     SetExpectationsForNotCachingProgram(program_,
                                         vertex_shader_,
                                         fragment_shader_);
   }
 
   void SetExpectationsForNotCachingProgram(
       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) {
     SetExpectationsForProgramLoad(kServiceProgramId,
                                   program_,
                                   vertex_shader_,
                                   fragment_shader_,
                                   result);
   }
 
   void SetExpectationsForProgramLoad(
       GLuint service_program_id,
       Program* program,
       Shader* vertex_shader,
       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));
   }
 
   void SetExpectationsForProgramLoadSuccess() {
     SetExpectationsForProgramLoadSuccess(kServiceProgramId);
   }
 
   void SetExpectationsForProgramLoadSuccess(GLuint service_program_id) {
     TestHelper::SetupProgramSuccessExpectations(
         gl_.get(), feature_info_.get(), nullptr, 0, nullptr, 0, nullptr, 0,
@@ skipping 329 matching lines @@
     ProgramManagerDualSourceBlendingES2Test,
     testing::Values(
         make_gl_ext_tuple("3.2",
                           "GL_ARB_draw_buffers GL_ARB_blend_func_extended "
                           "GL_ARB_program_interface_query"),
         make_gl_ext_tuple("opengl es 3.1",
                           "GL_EXT_draw_buffers GL_EXT_blend_func_extended")));
 
 }  // namespace gles2
 }  // namespace gpu