Revert of Refactor content/common/gpu into gpu/ipc/service

content/gpu/gpu_watchdog_thread.h

Index: content/gpu/gpu_watchdog_thread.h
diff --git a/content/gpu/gpu_watchdog_thread.h b/content/gpu/gpu_watchdog_thread.h
index 1b7cdbe952a0f765bb5a882e797a89934a5612ad..2f8cecd73de522418545383f46102cfe58ad033b 100644
--- a/content/gpu/gpu_watchdog_thread.h
+++ b/content/gpu/gpu_watchdog_thread.h
@@ -13,7 +13,7 @@
 #include "base/threading/thread.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
-#include "gpu/ipc/service/gpu_watchdog.h"
+#include "content/common/gpu/gpu_watchdog.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(USE_X11)
@@ -32,7 +32,7 @@
 // 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 GpuWatchdog,
                           public base::PowerObserver,
                           public base::RefCountedThreadSafe<GpuWatchdogThread> {
  public:
@@ -42,7 +42,7 @@
   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