| Index: content/gpu/gpu_watchdog_thread.h
|
| diff --git a/content/gpu/gpu_watchdog_thread.h b/content/gpu/gpu_watchdog_thread.h
|
| index 11d7b7dc6f28a0c85ed7b03cdf592b4177439899..fb95eeee0a268c7756494fa2740a75c8677745a1 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 "content/common/gpu/gpu_watchdog.h"
|
| +#include "gpu/ipc/service/gpu_watchdog.h"
|
| #include "ui/gfx/native_widget_types.h"
|
|
|
| #if defined(USE_X11)
|
| @@ -31,7 +31,7 @@ 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 GpuWatchdog,
|
| + public gpu::GpuWatchdog,
|
| public base::PowerObserver,
|
| public base::RefCountedThreadSafe<GpuWatchdogThread> {
|
| public:
|
| @@ -41,7 +41,7 @@ class GpuWatchdogThread : public base::Thread,
|
| bool armed() const { return armed_; }
|
| void PostAcknowledge();
|
|
|
| - // Implement GpuWatchdog.
|
| + // Implement gpu::GpuWatchdog.
|
| void CheckArmed() override;
|
|
|
| // Must be called after a PowerMonitor has been created. Can be called from
|
|
|