| Index: gpu/command_buffer/client/fenced_allocator_test.cc
|
| diff --git a/gpu/command_buffer/client/fenced_allocator_test.cc b/gpu/command_buffer/client/fenced_allocator_test.cc
|
| index ebd8ff6b9f53953a20aca0bf68a577295e7c2852..731f374fc62f0c6edf1b6f8ddd8dba4f83ecdfcd 100644
|
| --- a/gpu/command_buffer/client/fenced_allocator_test.cc
|
| +++ b/gpu/command_buffer/client/fenced_allocator_test.cc
|
| @@ -47,23 +47,17 @@ class BaseFencedAllocatorTest : public testing::Test {
|
| command_buffer_.reset(new CommandBufferService);
|
| command_buffer_->Initialize();
|
|
|
| - parser_ = new CommandParser(api_mock_.get());
|
| -
|
| gpu_scheduler_.reset(new GpuScheduler(
|
| - command_buffer_.get(), NULL, parser_));
|
| + command_buffer_.get(), api_mock_.get(), NULL));
|
| command_buffer_->SetPutOffsetChangeCallback(base::Bind(
|
| &GpuScheduler::PutChanged, base::Unretained(gpu_scheduler_.get())));
|
| + command_buffer_->SetGetBufferChangeCallback(base::Bind(
|
| + &GpuScheduler::SetGetBuffer, base::Unretained(gpu_scheduler_.get())));
|
|
|
| api_mock_->set_engine(gpu_scheduler_.get());
|
|
|
| helper_.reset(new CommandBufferHelper(command_buffer_.get()));
|
| helper_->Initialize(kBufferSize);
|
| -
|
| - // Note: parser->SetBuffer would normally be called through
|
| - // helper_->Initialize but currently it needs a GpuCommandBufferStub as the
|
| - // CommandBuffer instead of the CommandBufferService for that to happen.
|
| - Buffer ring_buffer = helper_->get_ring_buffer();
|
| - parser_->SetBuffer(ring_buffer.ptr, ring_buffer.size, 0, ring_buffer.size);
|
| }
|
|
|
| int32 GetToken() {
|
| @@ -77,7 +71,6 @@ class BaseFencedAllocatorTest : public testing::Test {
|
| scoped_ptr<AsyncAPIMock> api_mock_;
|
| scoped_ptr<CommandBufferService> command_buffer_;
|
| scoped_ptr<GpuScheduler> gpu_scheduler_;
|
| - CommandParser* parser_;
|
| scoped_ptr<CommandBufferHelper> helper_;
|
| };
|
|
|
|
|