Re-enable GPU watchdog for WebGL conformance tests.

content/test/gpu/gpu_tests/webgl_conformance_integration_test.py

Index: content/test/gpu/gpu_tests/webgl_conformance_integration_test.py
diff --git a/content/test/gpu/gpu_tests/webgl_conformance_integration_test.py b/content/test/gpu/gpu_tests/webgl_conformance_integration_test.py
index 81baa386803f199ea2886765702cbd5fd39df054..13f6cdf6cb3e30e080e43fe3bd798b7451383a99 100644
--- a/content/test/gpu/gpu_tests/webgl_conformance_integration_test.py
+++ b/content/test/gpu/gpu_tests/webgl_conformance_integration_test.py
@@ -259,11 +259,10 @@ class WebGLConformanceIntegrationTest(gpu_integration_test.GpuIntegrationTest):
         '--disable-domain-blocking-for-3d-apis',
         '--disable-gpu-process-crash-limit',
         '--test-type=gpu',
-        '--enable-experimental-canvas-features',
-        # Try disabling the GPU watchdog to see if this affects the
-        # intermittent GPU process hangs that have been seen on the
-        # waterfall. crbug.com/596622 crbug.com/609252
-        '--disable-gpu-watchdog'
+        '--enable-experimental-canvas-features'
+        # If intermittent GPU process hangs are seen on the waterfall,
+        # try re-adding the --disable-gpu-watchdog flag here.
+        # crbug.com/596622 crbug.com/609252
     ])
 
     builtin_js_flags = '--js-flags=--expose-gc'