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

content/gpu/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_
 
 #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/ipc/service/gpu_watchdog.h"
+#include "content/common/gpu/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"
 #include "ui/gfx/x/x11_types.h"
 
 #endif
 
 namespace content {
 
 // 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:
   explicit GpuWatchdogThread(int timeout);
 
   // 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;
 
@@ skipping 79 matching lines @@
 #endif
 
   base::WeakPtrFactory<GpuWatchdogThread> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuWatchdogThread);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_GPU_GPU_WATCHDOG_THREAD_H_