diff options
Diffstat (limited to 'gpu/command_buffer/common/command_buffer_mock.h')
| -rw-r--r-- | gpu/command_buffer/common/command_buffer_mock.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gpu/command_buffer/common/command_buffer_mock.h b/gpu/command_buffer/common/command_buffer_mock.h index faa5536..79d5682 100644 --- a/gpu/command_buffer/common/command_buffer_mock.h +++ b/gpu/command_buffer/common/command_buffer_mock.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 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. @@ -8,7 +8,7 @@ #include "gpu/command_buffer/common/command_buffer.h" #include "testing/gmock/include/gmock/gmock.h" -namespace command_buffer { +namespace gpu { // An NPObject that implements a shared memory command buffer and a synchronous // API to manage the put and get pointers. @@ -16,13 +16,13 @@ class MockCommandBuffer : public CommandBuffer { public: MockCommandBuffer() { ON_CALL(*this, GetRingBuffer()) - .WillByDefault(testing::Return(static_cast<::base::SharedMemory*>(NULL))); + .WillByDefault(testing::Return(static_cast<base::SharedMemory*>(NULL))); ON_CALL(*this, GetTransferBuffer(testing::_)) - .WillByDefault(testing::Return(static_cast<::base::SharedMemory*>(NULL))); + .WillByDefault(testing::Return(static_cast<base::SharedMemory*>(NULL))); } - MOCK_METHOD1(Initialize, bool(::base::SharedMemory* ring_buffer)); - MOCK_METHOD0(GetRingBuffer, ::base::SharedMemory*()); + MOCK_METHOD1(Initialize, base::SharedMemory*(int32 size)); + MOCK_METHOD0(GetRingBuffer, base::SharedMemory*()); MOCK_METHOD0(GetSize, int32()); MOCK_METHOD1(SyncOffsets, int32(int32 put_offset)); MOCK_METHOD0(GetGetOffset, int32()); @@ -31,7 +31,7 @@ class MockCommandBuffer : public CommandBuffer { MOCK_METHOD1(SetPutOffsetChangeCallback, void(Callback0::Type* callback)); MOCK_METHOD1(CreateTransferBuffer, int32(size_t size)); MOCK_METHOD1(DestroyTransferBuffer, void(int32 handle)); - MOCK_METHOD1(GetTransferBuffer, ::base::SharedMemory*(int32 handle)); + MOCK_METHOD1(GetTransferBuffer, base::SharedMemory*(int32 handle)); MOCK_METHOD0(GetToken, int32()); MOCK_METHOD1(SetToken, void(int32 token)); MOCK_METHOD0(ResetParseError, int32()); @@ -43,6 +43,6 @@ class MockCommandBuffer : public CommandBuffer { DISALLOW_COPY_AND_ASSIGN(MockCommandBuffer); }; -} // namespace command_buffer +} // namespace gpu #endif // GPU_COMMAND_BUFFER_COMMON_COMMAND_BUFFER_MOCK_H_ |