Index: gpu/ipc/service/gpu_channel_test_common.cc |
diff --git a/content/common/gpu/gpu_channel_test_common.cc b/gpu/ipc/service/gpu_channel_test_common.cc |
similarity index 87% |
rename from content/common/gpu/gpu_channel_test_common.cc |
rename to gpu/ipc/service/gpu_channel_test_common.cc |
index fe6f700014dca4e232da161ef52cd0e9b759b2bf..ae2021245fbd3a7238e9af17c5814965d1aef89f 100644 |
--- a/content/common/gpu/gpu_channel_test_common.cc |
+++ b/gpu/ipc/service/gpu_channel_test_common.cc |
@@ -2,16 +2,16 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "content/common/gpu/gpu_channel_test_common.h" |
+#include "gpu/ipc/service/gpu_channel_test_common.h" |
#include "base/test/test_simple_task_runner.h" |
#include "base/thread_task_runner_handle.h" |
-#include "content/common/gpu/gpu_channel_manager_delegate.h" |
#include "gpu/command_buffer/service/sync_point_manager.h" |
+#include "gpu/ipc/service/gpu_channel_manager_delegate.h" |
#include "ipc/ipc_test_sink.h" |
#include "url/gurl.h" |
-namespace content { |
+namespace gpu { |
TestGpuChannelManagerDelegate::TestGpuChannelManagerDelegate() {} |
@@ -32,11 +32,11 @@ void TestGpuChannelManagerDelegate::DidDestroyOffscreenContext( |
void TestGpuChannelManagerDelegate::DidLoseContext( |
bool offscreen, |
- gpu::error::ContextLostReason reason, |
+ error::ContextLostReason reason, |
const GURL& active_url) {} |
void TestGpuChannelManagerDelegate::GpuMemoryUmaStats( |
- const gpu::GPUMemoryUmaStats& params) {} |
+ const GPUMemoryUmaStats& params) {} |
void TestGpuChannelManagerDelegate::RemoveSubscription(int32_t client_id, |
unsigned int target) {} |
@@ -58,16 +58,16 @@ void TestGpuChannelManagerDelegate::SendAcceleratedSurfaceBuffersSwapped( |
#if defined(OS_WIN) |
void TestGpuChannelManagerDelegate::SendAcceleratedSurfaceCreatedChildWindow( |
- gpu::SurfaceHandle parent_window, |
- gpu::SurfaceHandle child_window) {} |
+ SurfaceHandle parent_window, |
+ SurfaceHandle child_window) {} |
#endif |
TestGpuChannelManager::TestGpuChannelManager( |
- const gpu::GpuPreferences& gpu_preferences, |
+ const GpuPreferences& gpu_preferences, |
GpuChannelManagerDelegate* delegate, |
base::SingleThreadTaskRunner* task_runner, |
base::SingleThreadTaskRunner* io_task_runner, |
- gpu::SyncPointManager* sync_point_manager, |
+ SyncPointManager* sync_point_manager, |
GpuMemoryBufferFactory* gpu_memory_buffer_factory) |
: GpuChannelManager(gpu_preferences, |
delegate, |
@@ -99,11 +99,11 @@ scoped_ptr<GpuChannel> TestGpuChannelManager::CreateGpuChannel( |
} |
TestGpuChannel::TestGpuChannel(GpuChannelManager* gpu_channel_manager, |
- gpu::SyncPointManager* sync_point_manager, |
+ SyncPointManager* sync_point_manager, |
gfx::GLShareGroup* share_group, |
- gpu::gles2::MailboxManager* mailbox_manager, |
- gpu::PreemptionFlag* preempting_flag, |
- gpu::PreemptionFlag* preempted_flag, |
+ gles2::MailboxManager* mailbox_manager, |
+ PreemptionFlag* preempting_flag, |
+ PreemptionFlag* preempted_flag, |
base::SingleThreadTaskRunner* task_runner, |
base::SingleThreadTaskRunner* io_task_runner, |
int client_id, |
@@ -148,7 +148,7 @@ bool TestGpuChannel::Send(IPC::Message* msg) { |
GpuChannelTestCommon::GpuChannelTestCommon() |
: task_runner_(new base::TestSimpleTaskRunner), |
io_task_runner_(new base::TestSimpleTaskRunner), |
- sync_point_manager_(new gpu::SyncPointManager(false)), |
+ sync_point_manager_(new SyncPointManager(false)), |
channel_manager_delegate_(new TestGpuChannelManagerDelegate()), |
channel_manager_( |
new TestGpuChannelManager(gpu_preferences_, |
@@ -166,4 +166,4 @@ GpuChannelTestCommon::~GpuChannelTestCommon() { |
io_task_runner_->ClearPendingTasks(); |
} |
-} // namespace content |
+} // namespace gpu |