diff options
Diffstat (limited to 'gpu/command_buffer/client/fenced_allocator_test.cc')
| -rw-r--r-- | gpu/command_buffer/client/fenced_allocator_test.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gpu/command_buffer/client/fenced_allocator_test.cc b/gpu/command_buffer/client/fenced_allocator_test.cc index 731f374..d34e158 100644 --- a/gpu/command_buffer/client/fenced_allocator_test.cc +++ b/gpu/command_buffer/client/fenced_allocator_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -13,6 +13,7 @@ #include "gpu/command_buffer/service/mocks.h" #include "gpu/command_buffer/service/command_buffer_service.h" #include "gpu/command_buffer/service/gpu_scheduler.h" +#include "gpu/command_buffer/service/transfer_buffer_manager.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_MACOSX) @@ -44,7 +45,13 @@ class BaseFencedAllocatorTest : public testing::Test { .WillRepeatedly(DoAll(Invoke(api_mock_.get(), &AsyncAPIMock::SetToken), Return(error::kNoError))); - command_buffer_.reset(new CommandBufferService); + { + TransferBufferManager* manager = new TransferBufferManager(); + transfer_buffer_manager_.reset(manager); + EXPECT_TRUE(manager->Initialize()); + } + command_buffer_.reset( + new CommandBufferService(transfer_buffer_manager_.get())); command_buffer_->Initialize(); gpu_scheduler_.reset(new GpuScheduler( @@ -69,6 +76,7 @@ class BaseFencedAllocatorTest : public testing::Test { #endif MessageLoop message_loop_; scoped_ptr<AsyncAPIMock> api_mock_; + scoped_ptr<TransferBufferManagerInterface> transfer_buffer_manager_; scoped_ptr<CommandBufferService> command_buffer_; scoped_ptr<GpuScheduler> gpu_scheduler_; scoped_ptr<CommandBufferHelper> helper_; |