Enable GPU watchdog timer.

chrome/gpu/gpu_main.cc

 // Copyright (c) 2010 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.
 
 #include <stdlib.h>
 
 #include "app/app_switches.h"
 #include "app/gfx/gl/gl_context.h"
 #include "app/gfx/gl/gl_implementation.h"
 #include "base/environment.h"
@@ skipping 113 matching lines @@
       !command_line.HasSwitch(switches::kDisableGpuWatchdog) &&
       gfx::GetGLImplementation() != gfx::kGLImplementationOSMesaGL &&
       !RunningOnValgrind();
 
   // Disable the watchdog in debug builds because they tend to only be run by
   // developers who will not appreciate the watchdog killing the GPU process.
 #ifndef NDEBUG
   enable_watchdog = false;
 #endif
 
-// TODO(apatrick): Disable for this commit. I want to enable this feature with
-// a simple single file change that can easily be reverted if need be without
-// losing all the other features of the patch.
-#if 1
-  enable_watchdog = false;
-#endif
-
   scoped_refptr<GpuWatchdogThread> watchdog_thread;
   if (enable_watchdog) {
     watchdog_thread = new GpuWatchdogThread(MessageLoop::current(),
                                             watchdog_timeout * 1000);
     watchdog_thread->Start();
   }
 
   // Do this immediately before running the message loop so the correct
   // initialization time is recorded in the GPU info.
   gpu_thread->Init(start_time);
 
   main_message_loop.Run();
 
   if (enable_watchdog)
     watchdog_thread->Stop();
 
   return 0;
 }