Index: content/common/gpu/media/gpu_video_decode_accelerator.cc |
diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc |
index 102046eaedd9d39089eadf644f48441f24c2b1ef..3ebbe61e7c4dd4731a918519c1626c356bb2cc28 100644 |
--- a/content/common/gpu/media/gpu_video_decode_accelerator.cc |
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc |
@@ -15,12 +15,12 @@ |
#include "base/thread_task_runner_handle.h" |
#include "build/build_config.h" |
-#include "content/common/gpu/gpu_channel.h" |
-#include "content/common/gpu/gpu_channel_manager.h" |
#include "content/common/gpu/media/gpu_video_accelerator_util.h" |
#include "content/common/gpu/media/media_messages.h" |
#include "gpu/command_buffer/common/command_buffer.h" |
#include "gpu/command_buffer/service/gpu_preferences.h" |
+#include "gpu/ipc/service/gpu_channel.h" |
+#include "gpu/ipc/service/gpu_channel_manager.h" |
#include "ipc/ipc_message_macros.h" |
#include "ipc/ipc_message_utils.h" |
#include "ipc/message_filter.h" |
@@ -53,7 +53,7 @@ |
namespace content { |
static bool MakeDecoderContextCurrent( |
- const base::WeakPtr<GpuCommandBufferStub> stub) { |
+ const base::WeakPtr<gpu::GpuCommandBufferStub> stub) { |
if (!stub) { |
DLOG(ERROR) << "Stub is gone; won't MakeCurrent()."; |
return false; |
@@ -127,7 +127,7 @@ class GpuVideoDecodeAccelerator::MessageFilter : public IPC::MessageFilter { |
GpuVideoDecodeAccelerator::GpuVideoDecodeAccelerator( |
int32_t host_route_id, |
- GpuCommandBufferStub* stub, |
+ gpu::GpuCommandBufferStub* stub, |
const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner) |
: host_route_id_(host_route_id), |
stub_(stub), |