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

gpu/ipc/service/gpu_watchdog_thread.h

 // Copyright (c) 2012 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.
 
-#ifndef CONTENT_GPU_GPU_WATCHDOG_THREAD_H_
-#define CONTENT_GPU_GPU_WATCHDOG_THREAD_H_
+#ifndef GPU_IPC_SERVICE_GPU_WATCHDOG_THREAD_H_
+#define GPU_IPC_SERVICE_GPU_WATCHDOG_THREAD_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/power_monitor/power_observer.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
+#include "gpu/gpu_export.h"
 #include "gpu/ipc/service/gpu_watchdog.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(USE_X11)
 extern "C" {
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 }
 #include <sys/poll.h>
 #include "ui/base/x/x11_util.h"  // nogncheck
 #include "ui/gfx/x/x11_types.h"  // nogncheck
-#endif
+#endif                           // defined(USE_X11)
 
-namespace content {
+namespace gpu {
 
 // A thread that intermitently sends tasks to a group of watched message loops
 // and deliberately crashes if one of them does not respond after a timeout.
-class GpuWatchdogThread : public base::Thread,
-                          public gpu::GpuWatchdog,
-                          public base::PowerObserver,
-                          public base::RefCountedThreadSafe<GpuWatchdogThread> {
+class GPU_EXPORT GpuWatchdogThread
+    : public base::Thread,
+      NON_EXPORTED_BASE(public GpuWatchdog),

[sadrul, 2016/08/28 13:01:58]

There's no other subclass of GpuWatchdog, and now that both the interface and
the only implementation is in gpu, and there are no users of GpuWatchdog from
out of gpu, maybe I should get rid of GpuWatchdog interface?

[Fady Samuel, 2016/08/29 16:41:37]

Since this isn't used in tests, this seems like a reasonable cleanup.

[sadrul, 2016/08/29 20:00:32]

Done.

+      public base::PowerObserver,
+      public base::RefCountedThreadSafe<GpuWatchdogThread> {
  public:
-  explicit GpuWatchdogThread(int timeout);
+  static scoped_refptr<GpuWatchdogThread> Create();
 
   // Accessible on watched thread but only modified by watchdog thread.
   bool armed() const { return armed_; }
   void PostAcknowledge();
 
-  // Implement gpu::GpuWatchdog.
+  // Implement GpuWatchdog.
   void CheckArmed() override;
 
   // Must be called after a PowerMonitor has been created. Can be called from
   // any thread.
   void AddPowerObserver();
 
  protected:
   void Init() override;
   void CleanUp() override;
 
  private:
   friend class base::RefCountedThreadSafe<GpuWatchdogThread>;
 
   // An object of this type intercepts the reception and completion of all tasks
   // on the watched thread and checks whether the watchdog is armed.
   class GpuWatchdogTaskObserver : public base::MessageLoop::TaskObserver {
    public:
     explicit GpuWatchdogTaskObserver(GpuWatchdogThread* watchdog);
     ~GpuWatchdogTaskObserver() override;
 
     // Implements MessageLoop::TaskObserver.
     void WillProcessTask(const base::PendingTask& pending_task) override;
     void DidProcessTask(const base::PendingTask& pending_task) override;
 
    private:
     GpuWatchdogThread* watchdog_;
   };
 
+  GpuWatchdogThread();
   ~GpuWatchdogThread() override;
 
   void OnAcknowledge();
   void OnCheck(bool after_suspend);
   void DeliberatelyTerminateToRecoverFromHang();
 #if defined(USE_X11)
   void SetupXServer();
   void SetupXChangeProp();
   bool MatchXEventAtom(XEvent* event);
 #endif
@@ skipping 54 matching lines @@
   XAtom atom_;
   FILE* tty_file_;
   int host_tty_;
 #endif
 
   base::WeakPtrFactory<GpuWatchdogThread> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuWatchdogThread);
 };
 
-}  // namespace content
+}  // namespace gpu
 
-#endif  // CONTENT_GPU_GPU_WATCHDOG_THREAD_H_
+#endif  // GPU_IPC_SERVICE_GPU_WATCHDOG_THREAD_H_