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

gpu/command_buffer/service/program_manager.h

 // 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.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 368 matching lines @@
   bool CheckVaryingsPacking(VaryingsPackingOption option) const;
 
   void TransformFeedbackVaryings(GLsizei count, const char* const* varyings,
       GLenum buffer_mode);
 
   // Visible for testing
   const LocationMap& bind_attrib_location_map() const {
     return bind_attrib_location_map_;
   }
 
-  const std::vector<std::string>& effective_transform_feedback_varyings()
-      const {
-    return effective_transform_feedback_varyings_;
+  const std::vector<std::string>& transform_feedback_varyings() const {
+    return transform_feedback_varyings_;
   }
 
-  GLenum effective_transform_feedback_buffer_mode() const {
-    return effective_transform_feedback_buffer_mode_;
+  GLenum transform_feedback_buffer_mode() const {
+    return transform_feedback_buffer_mode_;
   }
 
   // See member declaration for details.
   // The data are only valid after a successful link.
   uint32_t fragment_output_type_mask() const {
     return fragment_output_type_mask_;
   }
   uint32_t fragment_output_written_mask() const {
     return fragment_output_written_mask_;
   }
@@ skipping 141 matching lines @@
 
   // Log info
   std::unique_ptr<std::string> log_info_;
 
   // attribute-location binding map from glBindAttribLocation() calls.
   LocationMap bind_attrib_location_map_;
 
   // uniform-location binding map from glBindUniformLocationCHROMIUM() calls.
   LocationMap bind_uniform_location_map_;
 
-  // Set by glTransformFeedbackVaryings().
   std::vector<std::string> transform_feedback_varyings_;
+
   GLenum transform_feedback_buffer_mode_;
 
-  // After a successful link.
-  std::vector<std::string> effective_transform_feedback_varyings_;
-  GLenum effective_transform_feedback_buffer_mode_;
-
   // Fragment input-location binding map from
   // glBindFragmentInputLocationCHROMIUM() calls.
   LocationMap bind_fragment_input_location_map_;
 
   // output variable - (location,index) binding map from
   // glBindFragDataLocation() and ..IndexedEXT() calls.
   LocationIndexMap bind_program_output_location_index_map_;
 
   // It's stored in the order of uniform block indices, i.e., the first
   // entry is the info about UniformBlock with index 0, etc.
@@ skipping 114 matching lines @@
 };
 
 inline const FeatureInfo& Program::feature_info() const {
   return *manager_->feature_info_.get();
 }
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_PROGRAM_MANAGER_H_