annotator_commands: allow running different annotated scripts

scripts/master/factory/annotator_commands.py

Index: scripts/master/factory/annotator_commands.py
diff --git a/scripts/master/factory/annotator_commands.py b/scripts/master/factory/annotator_commands.py
index 30652d517d38adadc05d90e8639d13c9df5291aa..7865213073fa0ec803af488cf80b792353023f58 100644
--- a/scripts/master/factory/annotator_commands.py
+++ b/scripts/master/factory/annotator_commands.py
@@ -21,14 +21,11 @@ class AnnotatorCommands(commands.FactoryCommands):
     # Set self._script_dir and self._python, among other things.
     commands.FactoryCommands.__init__(self, factory)
 
-  def AddAnnotatedScript(self, timeout, max_time):
+  def AddAnnotatedScript(self, cmd, timeout, max_time):
     call_count = self._call_counts.setdefault('AddAnnotatedScript', 0)
     if call_count != 0:
       raise Exception("AnnotatorCommands.AddAnnotatedScript called twice.")
     self._call_counts['AddAnnotatedScript'] += 1
-    runner = self.PathJoin(self._script_dir, 'annotated_run.py')
-    cmd = [self._python, '-u', runner, '--use-factory-properties-from-disk']
-    cmd = self.AddB64GzBuildProperties(cmd)
     self._factory.addStep(chromium_step.AnnotatedCommand,
                           name='steps',
                           description='running steps via annotated script',