Revert "Trigger linux_layout_tests_layout_ng for LayoutNG changes"

third_party/WebKit/PRESUBMIT.py

 # Copyright (c) 2013 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.
 
 """Top-level presubmit script for Blink.
 
 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into gcl.
 """
 
@@ skipping 276 matching lines @@
                      'compositing'),
         os.path.join('third_party', 'WebKit', 'Source', 'core', 'paint'),
     ]
     for affected_file in change.AffectedFiles():
         file_path = affected_file.LocalPath()
         if any(x in file_path for x in paint_or_compositing_paths):
             return True
     return False
 
 
-def _AreLayoutNGDirectoriesModified(change):  # pylint: disable=C0103
-    """Checks whether CL has changes to a layout ng directory."""
-    layout_ng_paths = [
-        os.path.join('third_party', 'WebKit', 'Source', 'core', 'layout',
-                     'ng'),
-    ]
-    for affected_file in change.AffectedFiles():
-        file_path = affected_file.LocalPath()
-        if any(x in file_path for x in layout_ng_paths):
-            return True
-    return False
-
-
 def PostUploadHook(cl, change, output_api):  # pylint: disable=C0103
     """git cl upload will call this hook after the issue is created/modified.
 
     This hook adds extra try bots to the CL description in order to run slimming
-    paint v2 tests or LayoutNG tests in addition to the CQ try bots if the
-    change contains changes in a relevant direcotry (see:
-    _ArePaintOrCompositingDirectoriesModified and
-    _AreLayoutNGDirectoriesModified). For more information about
-    slimming-paint-v2 tests see https://crbug.com/601275 and for information
-    about the LayoutNG tests see https://crbug.com/706183.
+    paint v2 tests in addition to the CQ try bots if the change contains paint
+    or compositing changes (see: _ArePaintOrCompositingDirectoriesModified). For
+    more information about slimming-paint-v2 tests see https://crbug.com/601275.
     """
-    results = []
-    if _ArePaintOrCompositingDirectoriesModified(change):
-        results.extend(output_api.EnsureCQIncludeTrybotsAreAdded(
-            cl,
-            ['master.tryserver.chromium.linux:'
-             'linux_layout_tests_slimming_paint_v2'],
-            'Automatically added slimming-paint-v2 tests to run on CQ due to '
-            'changes in paint or compositing directories.'))
-    if _AreLayoutNGDirectoriesModified(change):
-        results.extend(output_api.EnsureCQIncludeTrybotsAreAdded(
-            cl,
-            ['master.tryserver.chromium.linux:'
-             'linux_layout_tests_layout_ng'],
-            'Automatically added linux_layout_tests_layout_ng to run on CQ due '
-            'to changes in LayoutNG directories.'))
-    return results
+    if not _ArePaintOrCompositingDirectoriesModified(change):
+        return []
+    return output_api.EnsureCQIncludeTrybotsAreAdded(
+        cl,
+        ['master.tryserver.chromium.linux:'
+         'linux_layout_tests_slimming_paint_v2'],
+        'Automatically added slimming-paint-v2 tests to run on CQ due to '
+        'changes in paint or compositing directories.')