Revert 260177 "By keeping track of transfer buffer usage (both s..."

trunk/src/gpu/command_buffer/client/buffer_tracker_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 the BufferTracker.
 
 #include "gpu/command_buffer/client/buffer_tracker.h"
 
 #include <GLES2/gl2ext.h>
 #include "base/memory/scoped_ptr.h"
@@ skipping 24 matching lines @@
   }
 
   void set_context_lost(bool context_lost) {
     context_lost_ = context_lost;
   }
 
  private:
   bool context_lost_;
 };
 
-namespace {
-void EmptyPoll() {
-}
-}
-
 class BufferTrackerTest : public testing::Test {
  protected:
   static const int32 kNumCommandEntries = 400;
   static const int32 kCommandBufferSizeBytes =
       kNumCommandEntries * sizeof(CommandBufferEntry);
 
   virtual void SetUp() {
     command_buffer_.reset(new MockClientCommandBufferImpl());
     helper_.reset(new GLES2CmdHelper(command_buffer_.get()));
     helper_->Initialize(kCommandBufferSizeBytes);
     mapped_memory_.reset(new MappedMemoryManager(
-        helper_.get(), base::Bind(&EmptyPoll), MappedMemoryManager::kNoLimit));
+        helper_.get(), MappedMemoryManager::kNoLimit));
     buffer_tracker_.reset(new BufferTracker(mapped_memory_.get()));
   }
 
   virtual void TearDown() {
     buffer_tracker_.reset();
     mapped_memory_.reset();
     helper_.reset();
     command_buffer_.reset();
   }
 
@@ skipping 53 matching lines @@
   // Check mapped memory address.
   EXPECT_EQ(64u, buffer->size());
   // Check mapped memory address.
   EXPECT_TRUE(buffer->address() == NULL);
   // Check no shared memory was allocated.
   EXPECT_EQ(0lu, mapped_memory_->num_chunks());
   // Check we can delete the buffer.
   buffer_tracker_->RemoveBuffer(kId);
 }
 
-TEST_F(BufferTrackerTest, Unmanage) {
-  const GLuint kId = 123;
-  const GLsizeiptr size = 64;
-
-  BufferTracker::Buffer* buffer = buffer_tracker_->CreateBuffer(kId, size);
-  ASSERT_TRUE(buffer != NULL);
-  EXPECT_EQ(mapped_memory_->bytes_in_use(), static_cast<size_t>(size));
-
-  void* mem = buffer->address();
-  buffer_tracker_->Unmanage(buffer);
-  buffer_tracker_->RemoveBuffer(kId);
-  EXPECT_EQ(mapped_memory_->bytes_in_use(), static_cast<size_t>(size));
-
-  mapped_memory_->Free(mem);
-  EXPECT_EQ(mapped_memory_->bytes_in_use(), static_cast<size_t>(0));
-}
-
 }  // namespace gles2
 }  // namespace gpu