gpu: Move GpuWatchdogThread into //gpu/ipc/service from content.

services/ui/gpu/gpu_service_internal.cc

 // Copyright 2016 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.
 
 #include "services/ui/gpu/gpu_service_internal.h"
 
 #include "base/memory/shared_memory.h"
 #include "base/memory/singleton.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "gpu/command_buffer/service/sync_point_manager.h"
 #include "gpu/config/gpu_info_collector.h"
 #include "gpu/config/gpu_switches.h"
 #include "gpu/config/gpu_util.h"
 #include "gpu/ipc/common/gpu_memory_buffer_support.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"
 #include "media/gpu/ipc/service/gpu_video_decode_accelerator.h"
 #include "media/gpu/ipc/service/gpu_video_encode_accelerator.h"
 #include "media/gpu/ipc/service/media_service.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/gl/gpu_switching_manager.h"
 #include "ui/gl/init/gl_factory.h"
@@ skipping 147 matching lines @@
     VLOG(1) << "gl::init::InitializeGLOneOff failed";
 
   DCHECK(!owned_sync_point_manager_);
   const bool allow_threaded_wait = false;
   owned_sync_point_manager_.reset(
       new gpu::SyncPointManager(allow_threaded_wait));
 
   // Defer creation of the render thread. This is to prevent it from handling
   // IPC messages before the sandbox has been enabled and all other necessary
   // initialization has succeeded.
-  // TODO(penghuang): implement a watchdog.
-  gpu::GpuWatchdog* watchdog = nullptr;
+  watchdog_thread_ = gpu::GpuWatchdogThread::Create();
   gpu_channel_manager_.reset(new gpu::GpuChannelManager(
-      gpu_preferences_, this, watchdog,
+      gpu_preferences_, this, watchdog_thread_.get(),
       base::ThreadTaskRunnerHandle::Get().get(), io_thread_.task_runner().get(),
       &shutdown_event_, owned_sync_point_manager_.get(),
       gpu_memory_buffer_factory_.get()));
 
   media_service_.reset(new media::MediaService(gpu_channel_manager_.get()));
   event->Signal();
 }
 
 void GpuServiceInternal::EstablishGpuChannelOnGpuThread(
     int client_id,
@@ skipping 50 matching lines @@
                               allow_real_time_streams, callback);
 }
 
 // static
 GpuServiceInternal* GpuServiceInternal::GetInstance() {
   return base::Singleton<GpuServiceInternal,
                          base::LeakySingletonTraits<GpuServiceInternal>>::get();
 }
 
 }  // namespace ui