Manually merging trunk revs 95836 and 96904 to 835 branch (second attempt)

gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h

 // Copyright (c) 2011 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_GLES2_CMD_DECODER_UNITTEST_BASE_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_
 
 #include "gpu/command_buffer/common/gl_mock.h"
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
@@ skipping 151 matching lines @@
 
   void SetBucketAsCString(uint32 bucket_id, const char* str);
 
   void InitDecoder(
       const char* extensions,
       bool has_alpha,
       bool has_depth,
       bool has_stencil,
       bool request_alpha,
       bool request_depth,
-      bool request_stencil);
+      bool request_stencil,
+      bool bind_generates_resource);
 
   const ContextGroup& group() const {
     return *group_.get();
   }
 
   struct AttribInfo {
     const char* name;
     GLint size;
     GLenum type;
     GLint location;
@@ skipping 233 matching lines @@
   void DeleteIndexBuffer();
 
   GLuint client_vertex_shader_id_;
   GLuint client_fragment_shader_id_;
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_