Revert of Apply patch for bot_update

scripts/master/factory/gclient_factory.py

 # Copyright (c) 2012 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.
 
 """Utility classes to generate and manage a BuildFactory to be passed to a
 builder dictionary as the 'factory' member, for each builder in c['builders'].
 
 Specifically creates a base BuildFactory that will execute a gclient checkout
 first."""
 
@@ skipping 179 matching lines @@
       gclient_deps = factory_properties.get('gclient_deps', None)
 
     if gclient_deps == 'ios':
       gclient_spec += ';target_os = [\'ios\'];target_os_only = True'
 
     # Force the build checkout to be at some revision.  This may or may not
     # activate depending on its own criteria, but the expectation is that if
     # this does activate, it will emit a BOT_UPDATED file in the build/
     # directory to signal to the other gclient update steps to no-op.
     code_review_site = config.Master.Master4.code_review_site
-    factory_cmd_obj.AddBotUpdateStep(env, gclient_spec, self._revision_mapping,
-                                     server=code_review_site)
+    factory_cmd_obj.AddBotUpdateStep(env, gclient_spec, code_review_site)
 
 
     # svn timeout is 2 min; we allow 5
     timeout = factory_properties.get('gclient_timeout')
     if official_release or factory_properties.get('nuke_and_pave'):
       no_gclient_branch = factory_properties.get('no_gclient_branch', False)
       factory_cmd_obj.AddClobberTreeStep(gclient_spec, env, timeout,
           gclient_deps=gclient_deps, gclient_nohooks=self._nohooks_on_update,
           no_gclient_branch=no_gclient_branch)
     else:
@@ skipping 147 matching lines @@
 
     if slave_type in ('AnnotatedTrybot', 'CrosTrybot', 'Trybot', 'Bisect',
                       'TrybotTester', 'TrybotBuilder'):
       factory_cmd_obj.AddApplyIssueStep(
           timeout=timeout,
           server=config.Master.Master4.code_review_site,
           revision_mapping=self._revision_mapping)
 
     if not self._nohooks_on_update:
       factory_cmd_obj.AddRunHooksStep(env=env, timeout=timeout)