Revert "Remove all safesync_url functionality from gclient"

recipe_modules/bot_update/resources/bot_update.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 # TODO(hinoka): Use logging.
 
 import cStringIO
 import codecs
 import collections
@@ skipping 635 matching lines @@
           print 'Dropping %s:%s from custom deps' % (deps_name, deps_value)
         else:
           new_custom_deps[deps_name] = deps_value
       solution['custom_deps'] = new_custom_deps
 
     if first_solution:
       root = parsed_path
       first_solution = False
 
     solution['managed'] = False
+    # We don't want gclient to be using a safesync URL. Instead it should
+    # using the lkgr/lkcr branch/tags.
+    if 'safesync_url' in solution:
+      print 'Removing safesync url %s from %s' % (solution['safesync_url'],
+                                                  parsed_path)
+      del solution['safesync_url']
   return solutions, root, buildspec
 
 
 def remove(target):
   """Remove a target by moving it into build.dead."""
   dead_folder = path.join(BUILDER_DIR, 'build.dead')
   if not path.exists(dead_folder):
     os.makedirs(dead_folder)
   os.rename(target, path.join(dead_folder, uuid.uuid4().hex))
 
@@ skipping 1102 matching lines @@
   except Exception:
     # Unexpected failure.
     emit_flag(options.flag_file)
     raise
   else:
     emit_flag(options.flag_file)
 
 
 if __name__ == '__main__':
   sys.exit(main())