remote_run_factory: keep timeout defaults in sync with annotator_factory

scripts/master/factory/remote_run_factory.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.
 
 from master.factory import annotator_commands
 from master.factory import commands
 from master.factory.build_factory import BuildFactory
 
 
+# TODO(nodir): restore timeout=1200, https://crbug.com/593891
 def RemoteRunFactory(active_master, repository, recipe,
                      revision='origin/master', factory_properties=None,
-                     timeout=1200, max_time=2400, triggers=None):
+                     timeout=2400, max_time=None, triggers=None):
   """Returns buildbot build factory which runs recipes using recipe engine's
   remote_run command.
 
   |active_master| is config_bootstrap.Master's subclass from master's
   master_site_config.py .
 
   |repository| is the URL of repository containing recipe to run.
 
   |recipe| is the name of the recipe to run.
 
@@ skipping 33 matching lines @@
   cmd = cmd_obj.AddB64GzBuildProperties(cmd)
   cmd = cmd_obj.AddB64GzFactoryProperties(factory_properties, cmd)
 
   cmd_obj.AddAnnotatedScript(cmd, timeout=timeout, max_time=max_time)
 
   for t in triggers or []:
     factory.addStep(commands.CreateTriggerStep(
         t, trigger_copy_properties=['swarm_hashes']))
 
   return factory