| Index: content/gpu/gpu_child_thread.cc
|
| diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc
|
| index 2e318a7fce0b389f1e8317e96763ada40a4e3e55..952dbc10f3bf0040216cb3e2fc50f855a2d293c2 100644
|
| --- a/content/gpu/gpu_child_thread.cc
|
| +++ b/content/gpu/gpu_child_thread.cc
|
| @@ -148,15 +148,6 @@ void GpuChildThread::OnInitialize() {
|
| enable_watchdog = false;
|
| #endif
|
|
|
| - // Disable the watchdog for Windows. It tends to abort when the GPU process
|
| - // is not hung but still taking a long time to do something. Instead, the
|
| - // browser process displays a dialog when it notices that the child window
|
| - // is hung giving the user an opportunity to terminate it. This is the
|
| - // same mechanism used to abort hung plugins.
|
| -#if defined(OS_WIN)
|
| - enable_watchdog = false;
|
| -#endif
|
| -
|
| // Start the GPU watchdog only after anything that is expected to be time
|
| // consuming has completed, otherwise the process is liable to be aborted.
|
| if (enable_watchdog) {
|
|
|