Use an explicit list of webkit-patch commands instead of using auto-discovery.

third_party/WebKit/Tools/Scripts/webkitpy/tool/webkit_patch.py

Index: third_party/WebKit/Tools/Scripts/webkitpy/tool/webkit_patch.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/tool/webkit_patch.py b/third_party/WebKit/Tools/Scripts/webkitpy/tool/webkit_patch.py
index a26adbaaca0f9c8f055007a0134ffc64a989014f..3a916c314096cc1bfd2c7d2a62488045659fbd99 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/tool/webkit_patch.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/tool/webkit_patch.py
@@ -33,7 +33,23 @@ from optparse import make_option
 
 from webkitpy.common.host import Host
 from webkitpy.tool.multi_command_tool import MultiCommandTool
-from webkitpy.tool import commands
+
+from webkitpy.tool.commands.analyze_baselines import AnalyzeBaselines
+from webkitpy.tool.commands.commit_announcer import CommitAnnouncerCommand
+from webkitpy.tool.commands.flaky_tests import FlakyTests
+from webkitpy.tool.commands.layout_tests_server import LayoutTestsServer
+from webkitpy.tool.commands.pretty_diff import PrettyDiff
+from webkitpy.tool.commands.queries import CrashLog
+from webkitpy.tool.commands.queries import PrintBaselines
+from webkitpy.tool.commands.queries import PrintExpectations
+from webkitpy.tool.commands.rebaseline import AutoRebaseline
+from webkitpy.tool.commands.rebaseline import CopyExistingBaselinesInternal
+from webkitpy.tool.commands.rebaseline import OptimizeBaselines
+from webkitpy.tool.commands.rebaseline import Rebaseline
+from webkitpy.tool.commands.rebaseline import RebaselineExpectations
+from webkitpy.tool.commands.rebaseline import RebaselineJson
+from webkitpy.tool.commands.rebaseline import RebaselineTest
+from webkitpy.tool.commands.rebaseline_server import RebaselineServer
 
 
 class WebKitPatch(MultiCommandTool, Host):
@@ -47,6 +63,24 @@ class WebKitPatch(MultiCommandTool, Host):
         MultiCommandTool.__init__(self)
         Host.__init__(self)
         self._path = path
+        self.commands = [

[Xianzhu, 2016/06/17 06:16:40]

This should be passed to the constructor of MultiCommandTool. With the current
code, the commands are not bound to tool.

+            AnalyzeBaselines(),
+            AutoRebaseline(),
+            CommitAnnouncerCommand(),
+            CopyExistingBaselinesInternal(),
+            CrashLog(),
+            FlakyTests(),
+            LayoutTestsServer(),
+            OptimizeBaselines(),
+            PrettyDiff(),
+            PrintBaselines(),
+            PrintExpectations(),
+            Rebaseline(),
+            RebaselineExpectations(),
+            RebaselineJson(),
+            RebaselineServer(),
+            RebaselineTest(),
+        ]
 
     def path(self):
         return self._path