| Index: content/gpu/gpu_child_thread.cc
|
| diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc
|
| index bfec82c27c9fa7767bfd6316c37675e32276e374..8b7cb58fb0c112a55e972ac424611bc2b371b31e 100644
|
| --- a/content/gpu/gpu_child_thread.cc
|
| +++ b/content/gpu/gpu_child_thread.cc
|
| @@ -20,7 +20,6 @@
|
| #include "content/common/gpu_host_messages.h"
|
| #include "content/common/mojo/constants.h"
|
| #include "content/gpu/gpu_service_factory.h"
|
| -#include "content/gpu/gpu_watchdog_thread.h"
|
| #include "content/public/common/content_client.h"
|
| #include "content/public/common/content_switches.h"
|
| #include "content/public/common/mojo_shell_connection.h"
|
| @@ -32,6 +31,7 @@
|
| #include "gpu/config/gpu_util.h"
|
| #include "gpu/ipc/common/memory_stats.h"
|
| #include "gpu/ipc/service/gpu_memory_buffer_factory.h"
|
| +#include "gpu/ipc/service/gpu_watchdog_thread.h"
|
| #include "ipc/ipc_channel_handle.h"
|
| #include "ipc/ipc_sync_message_filter.h"
|
| #include "media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h"
|
| @@ -145,7 +145,7 @@ ChildThreadImpl::Options GetOptions(
|
| } // namespace
|
|
|
| GpuChildThread::GpuChildThread(
|
| - GpuWatchdogThread* watchdog_thread,
|
| + gpu::GpuWatchdogThread* watchdog_thread,
|
| bool dead_on_arrival,
|
| const gpu::GPUInfo& gpu_info,
|
| const DeferredMessages& deferred_messages,
|
|
|