Revert 177054

gpu/command_buffer/client/gles2_implementation_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.
 
 // Tests for GLES2Implementation.
 
 #include "gpu/command_buffer/client/gles2_implementation.h"
 
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
@@ skipping 230 matching lines @@
 
 void* MockTransferBuffer::GetResultBuffer() {
   return actual_buffer() + actual_buffer_index_ * alignment_;
 }
 
 int MockTransferBuffer::GetResultOffset() {
   return actual_buffer_index_ * alignment_;
 }
 
 void MockTransferBuffer::Free() {
+  GPU_NOTREACHED();
 }
 
 bool MockTransferBuffer::HaveBuffer() const {
   return true;
 }
 
 void* MockTransferBuffer::AllocUpTo(
     unsigned int size, unsigned int* size_allocated) {
   EXPECT_TRUE(size_allocated != NULL);
   EXPECT_TRUE(last_alloc_ == NULL);
@@ skipping 1187 matching lines @@
   struct Cmds {
     BufferSubData buf;
     cmd::SetToken set_token;
   };
   const GLenum kTarget = GL_ELEMENT_ARRAY_BUFFER;
   const GLintptr kOffset = 15;
   const GLsizeiptr kSize = 16;
 
   uint32 offset = 0;
   Cmds expected;
-  int32 shm_id = command_buffer()->GetNextFreeTransferBufferId();
-  expected.buf.Init(kTarget, kOffset, kSize, shm_id, offset);
+  expected.buf.Init(
+      kTarget, kOffset, kSize,
+      command_buffer()->GetNextFreeTransferBufferId(), offset);
   expected.set_token.Init(GetNextToken());
 
   void* mem = gl_->MapBufferSubDataCHROMIUM(
       kTarget, kOffset, kSize, GL_WRITE_ONLY);
   ASSERT_TRUE(mem != NULL);
   gl_->UnmapBufferSubDataCHROMIUM(mem);
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
-
-  EXPECT_CALL(*command_buffer(), DestroyTransferBuffer(shm_id))
-      .Times(1)
-      .RetiresOnSaturation();
-  gl_->FreeUnusedSharedMemory();
 }
 
 TEST_F(GLES2ImplementationTest, MapUnmapBufferSubDataCHROMIUMBadArgs) {
   const GLenum kTarget = GL_ELEMENT_ARRAY_BUFFER;
   const GLintptr kOffset = 15;
   const GLsizeiptr kSize = 16;
 
   ExpectedMemoryInfo result1 =
       GetExpectedResultMemory(sizeof(GetError::Result));
   ExpectedMemoryInfo result2 =
@@ skipping 34 matching lines @@
   const GLint kLevel = 1;
   const GLint kXOffset = 2;
   const GLint kYOffset = 3;
   const GLint kWidth = 4;
   const GLint kHeight = 5;
   const GLenum kFormat = GL_RGBA;
   const GLenum kType = GL_UNSIGNED_BYTE;
 
   uint32 offset = 0;
   Cmds expected;
-  int32 shm_id = command_buffer()->GetNextFreeTransferBufferId();
   expected.tex.Init(
       GL_TEXTURE_2D, kLevel, kXOffset, kYOffset, kWidth, kHeight, kFormat,
-      kType, shm_id, offset, GL_FALSE);
+      kType,
+      command_buffer()->GetNextFreeTransferBufferId(), offset, GL_FALSE);
   expected.set_token.Init(GetNextToken());
 
   void* mem = gl_->MapTexSubImage2DCHROMIUM(
       GL_TEXTURE_2D,
       kLevel,
       kXOffset,
       kYOffset,
       kWidth,
       kHeight,
       kFormat,
       kType,
       GL_WRITE_ONLY);
   ASSERT_TRUE(mem != NULL);
   gl_->UnmapTexSubImage2DCHROMIUM(mem);
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
-
-  EXPECT_CALL(*command_buffer(), DestroyTransferBuffer(shm_id))
-      .Times(1)
-      .RetiresOnSaturation();
-  gl_->FreeUnusedSharedMemory();
 }
 
 TEST_F(GLES2ImplementationTest, MapUnmapTexSubImage2DCHROMIUMBadArgs) {
   const GLint kLevel = 1;
   const GLint kXOffset = 2;
   const GLint kYOffset = 3;
   const GLint kWidth = 4;
   const GLint kHeight = 5;
   const GLenum kFormat = GL_RGBA;
   const GLenum kType = GL_UNSIGNED_BYTE;
@@ skipping 1130 matching lines @@
   gl_->GetQueryObjectuivEXT(4567, GL_QUERY_RESULT_AVAILABLE_EXT, &available);
   EXPECT_TRUE(NoCommandsWritten());
   EXPECT_EQ(0xBDu, available);
   EXPECT_EQ(GL_INVALID_OPERATION, CheckError());
 
   // Test GetQueryObjectuivEXT CheckResultsAvailable
   ClearCommands();
   gl_->GetQueryObjectuivEXT(id1, GL_QUERY_RESULT_AVAILABLE_EXT, &available);
   EXPECT_TRUE(NoCommandsWritten());
   EXPECT_EQ(0u, available);
-
-  EXPECT_CALL(*command_buffer(), DestroyTransferBuffer(_))
-      .Times(1)
-      .RetiresOnSaturation();
 }
 
 TEST_F(GLES2ImplementationTest, ErrorQuery) {
   GLuint id = 0;
   gl_->GenQueriesEXT(1, &id);
   ClearCommands();
 
   // Test BeginQueryEXT does NOT insert commands.
   gl_->BeginQueryEXT(GL_GET_ERROR_QUERY_CHROMIUM, id);
   EXPECT_TRUE(NoCommandsWritten());
@@ skipping 34 matching lines @@
   // Check result is available.
   gl_->GetQueryObjectuivEXT(id, GL_QUERY_RESULT_AVAILABLE_EXT, &available);
   EXPECT_TRUE(NoCommandsWritten());
   EXPECT_NE(0u, available);
 
   // Check result.
   GLuint result = 0xBDu;
   gl_->GetQueryObjectuivEXT(id, GL_QUERY_RESULT_EXT, &result);
   EXPECT_TRUE(NoCommandsWritten());
   EXPECT_EQ(static_cast<GLuint>(GL_INVALID_ENUM), result);
-
-  EXPECT_CALL(*command_buffer(), DestroyTransferBuffer(_))
-      .Times(1)
-      .RetiresOnSaturation();
 }
 
 #if !defined(GLES2_SUPPORT_CLIENT_SIDE_ARRAYS)
 TEST_F(GLES2ImplementationTest, VertexArrays) {
   const GLuint kAttribIndex1 = 1;
   const GLint kNumComponents1 = 3;
   const GLsizei kClientStride = 12;
 
   GLuint id = 0;
   gl_->GenVertexArraysOES(1, &id);
@@ skipping 45 matching lines @@
   gl_->Enable(GL_BLEND);
   EXPECT_TRUE(NoCommandsWritten());
 }
 
 
 #include "gpu/command_buffer/client/gles2_implementation_unittest_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu