Re-enable GPU watchdog for WebGL conformance tests.

content/test/gpu/gpu_tests/webgl_conformance_integration_test.py

 # Copyright 2016 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.
 
 import logging
 import os
 import sys
 
 from gpu_tests import gpu_integration_test
 from gpu_tests import path_util
@@ skipping 241 matching lines @@
   def CustomizeOptions(cls):
     assert cls._webgl_version == 1 or cls._webgl_version == 2
     browser_options = cls._finder_options.browser_options
     # --test-type=gpu is used only to suppress the "Google API Keys are missing"
     # infobar, which causes flakiness in tests.
     browser_options.AppendExtraBrowserArgs([
         '--ignore-autoplay-restrictions',
         '--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'
     found_js_flags = False
     user_js_flags = ''
     if browser_options.extra_browser_args:
       for o in browser_options.extra_browser_args:
         if o.startswith('--js-flags'):
           found_js_flags = True
           user_js_flags = o
@@ skipping 119 matching lines @@
           if webgl_version > 1:
             test += '?webglVersion=' + str(webgl_version)
           test_paths.append(test)
 
     return test_paths
 
 
 def load_tests(loader, tests, pattern):
   del loader, tests, pattern  # Unused.
   return gpu_integration_test.LoadAllTestsInModule(sys.modules[__name__])