| Index: gpu/command_buffer/client/ring_buffer_test.cc
|
| diff --git a/gpu/command_buffer/client/ring_buffer_test.cc b/gpu/command_buffer/client/ring_buffer_test.cc
|
| index cf3418f11bd101f1ecb907398684804e80caa0e8..3e1b26674e065a75078ca35459cd056ebaef98ea 100644
|
| --- a/gpu/command_buffer/client/ring_buffer_test.cc
|
| +++ b/gpu/command_buffer/client/ring_buffer_test.cc
|
| @@ -8,6 +8,8 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| #include "gpu/command_buffer/client/cmd_buffer_helper.h"
|
| @@ -91,15 +93,15 @@ class BaseRingBufferTest : public testing::Test {
|
|
|
| int32_t GetToken() { return command_buffer_->GetLastState().token; }
|
|
|
| - scoped_ptr<AsyncAPIMock> api_mock_;
|
| + std::unique_ptr<AsyncAPIMock> api_mock_;
|
| scoped_refptr<TransferBufferManagerInterface> transfer_buffer_manager_;
|
| - scoped_ptr<CommandBufferService> command_buffer_;
|
| - scoped_ptr<CommandExecutor> executor_;
|
| - scoped_ptr<CommandBufferHelper> helper_;
|
| + std::unique_ptr<CommandBufferService> command_buffer_;
|
| + std::unique_ptr<CommandExecutor> executor_;
|
| + std::unique_ptr<CommandBufferHelper> helper_;
|
| std::vector<const void*> set_token_arguments_;
|
| bool delay_set_token_;
|
|
|
| - scoped_ptr<int8_t[]> buffer_;
|
| + std::unique_ptr<int8_t[]> buffer_;
|
| int8_t* buffer_start_;
|
| base::MessageLoop message_loop_;
|
| };
|
| @@ -131,7 +133,7 @@ class RingBufferTest : public BaseRingBufferTest {
|
| BaseRingBufferTest::TearDown();
|
| }
|
|
|
| - scoped_ptr<RingBuffer> allocator_;
|
| + std::unique_ptr<RingBuffer> allocator_;
|
| };
|
|
|
| // Checks basic alloc and free.
|
|
|