| Index: gpu/command_buffer/service/gpu_processor_mock.h
|
| ===================================================================
|
| --- gpu/command_buffer/service/gpu_processor_mock.h (revision 34314)
|
| +++ gpu/command_buffer/service/gpu_processor_mock.h (working copy)
|
| @@ -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/service/gpu_processor.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
|
|
| -namespace command_buffer {
|
| +namespace gpu {
|
|
|
| class MockGPUProcessor : public GPUProcessor {
|
| public:
|
| @@ -16,17 +16,12 @@
|
| : GPUProcessor(command_buffer) {
|
| }
|
|
|
| -#if defined(OS_WIN)
|
| - MOCK_METHOD1(Initialize, bool(HWND handle));
|
| -#endif
|
| -
|
| + MOCK_METHOD1(Initialize, bool(gfx::PluginWindowHandle handle));
|
| MOCK_METHOD0(Destroy, void());
|
| MOCK_METHOD0(ProcessCommands, void());
|
| -
|
| -#if defined(OS_WIN)
|
| - MOCK_METHOD3(SetWindow, bool(HWND handle, int width, int height));
|
| -#endif
|
| -
|
| + MOCK_METHOD3(SetWindow, bool(gfx::PluginWindowHandle handle,
|
| + int width,
|
| + int height));
|
| MOCK_METHOD1(GetSharedMemoryAddress, void*(int32 shm_id));
|
| MOCK_METHOD1(GetSharedMemorySize, size_t(int32 shm_id));
|
| MOCK_METHOD1(set_token, void(int32 token));
|
| @@ -35,6 +30,6 @@
|
| DISALLOW_COPY_AND_ASSIGN(MockGPUProcessor);
|
| };
|
|
|
| -} // namespace command_buffer
|
| +} // namespace gpu
|
|
|
| #endif // GPU_COMMAND_BUFFER_SERVICE_GPU_PROCESSOR_MOCK_H_
|
|
|