| Index: gpu/ipc/service/gpu_channel_manager_unittest.cc
|
| diff --git a/content/common/gpu/gpu_channel_manager_unittest.cc b/gpu/ipc/service/gpu_channel_manager_unittest.cc
|
| similarity index 91%
|
| rename from content/common/gpu/gpu_channel_manager_unittest.cc
|
| rename to gpu/ipc/service/gpu_channel_manager_unittest.cc
|
| index 7c3cc0b3002c718841a93142206225786679094e..aa13068e265fe13ead663b8d8eb2763ec233783b 100644
|
| --- a/content/common/gpu/gpu_channel_manager_unittest.cc
|
| +++ b/gpu/ipc/service/gpu_channel_manager_unittest.cc
|
| @@ -5,17 +5,16 @@
|
| #include <stddef.h>
|
| #include <stdint.h>
|
|
|
| -#include "content/common/gpu/gpu_channel.h"
|
| -#include "content/common/gpu/gpu_channel_manager.h"
|
| -#include "content/common/gpu/gpu_channel_test_common.h"
|
| #include "gpu/command_buffer/common/value_state.h"
|
| #include "gpu/command_buffer/service/gl_utils.h"
|
| #include "gpu/command_buffer/service/valuebuffer_manager.h"
|
| +#include "gpu/ipc/service/gpu_channel.h"
|
| +#include "gpu/ipc/service/gpu_channel_manager.h"
|
| +#include "gpu/ipc/service/gpu_channel_test_common.h"
|
|
|
| using gpu::gles2::ValuebufferManager;
|
| -using gpu::ValueState;
|
|
|
| -namespace content {
|
| +namespace gpu {
|
|
|
| class GpuChannelManagerTest : public GpuChannelTestCommon {
|
| public:
|
| @@ -81,9 +80,9 @@ TEST_F(GpuChannelManagerTest, SecureValueStateForwarding) {
|
| channel_manager()->UpdateValueState(kClientId2, GL_MOUSE_POSITION_CHROMIUM,
|
| value_state2);
|
|
|
| - const gpu::ValueStateMap* pending_value_buffer_state1 =
|
| + const ValueStateMap* pending_value_buffer_state1 =
|
| channel1->pending_valuebuffer_state();
|
| - const gpu::ValueStateMap* pending_value_buffer_state2 =
|
| + const ValueStateMap* pending_value_buffer_state2 =
|
| channel2->pending_valuebuffer_state();
|
| EXPECT_NE(pending_value_buffer_state1, pending_value_buffer_state2);
|
|
|
| @@ -98,4 +97,4 @@ TEST_F(GpuChannelManagerTest, SecureValueStateForwarding) {
|
| EXPECT_NE(state1->int_value[0], state2->int_value[0]);
|
| }
|
|
|
| -} // namespace content
|
| +} // namespace gpu
|
|
|