| Index: trunk/src/gpu/command_buffer/client/buffer_tracker_unittest.cc
|
| ===================================================================
|
| --- trunk/src/gpu/command_buffer/client/buffer_tracker_unittest.cc (revision 260192)
|
| +++ trunk/src/gpu/command_buffer/client/buffer_tracker_unittest.cc (working copy)
|
| @@ -42,11 +42,6 @@
|
| bool context_lost_;
|
| };
|
|
|
| -namespace {
|
| -void EmptyPoll() {
|
| -}
|
| -}
|
| -
|
| class BufferTrackerTest : public testing::Test {
|
| protected:
|
| static const int32 kNumCommandEntries = 400;
|
| @@ -58,7 +53,7 @@
|
| 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()));
|
| }
|
|
|
| @@ -132,22 +127,5 @@
|
| 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
|
|
|