Switch to cipd module in depot_tools

scripts/slave/cipd.py

 #!/usr/bin/env python
 # Copyright 2015 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.
 
 """cipd.py bootstraps a CIPD client and installs named CIPD packages to a
 directory.
 """
 
 import argparse
@@ skipping 17 matching lines @@
 LOGGER = logging.getLogger('cipd')
 
 # Used to contain a CIPD package specification.
 CipdPackage = collections.namedtuple('CipdPackage', ('name', 'version'))
 
 # A CIPD binary description - relative path of the binary within the package.
 CipdBinary = collections.namedtuple('CipdBinary', ('package', 'relpath'))
 
 
 def bootstrap(path):
-  bootstrap_path = os.path.join(common.env.Build, 'scripts', 'slave',
-                                'recipe_modules', 'cipd', 'resources',
-                                'bootstrap.py')
+  bootstrap_path = os.path.join(
+      common.env.Build, 'scripts', 'slave', 'cipd_bootstrap.py')
 
   plat, bits = slave.infra_platform.get()
   plat = '%s-%s' % (
       plat.replace('win', 'windows'),
       {
           32: '386',
           64: 'amd64',
       }[bits]
   )
   json_output = os.path.join(path, 'cipd_bootstrap.json')
@@ skipping 83 matching lines @@
   LOGGER.info('CIPD ensuring %d package(s)...', len(opts.package))
   cipd_ensure(client, opts.dest_directory, opts.package,
               service_account_json=opts.service_account_json,
               json_output=opts.json_output)
   return 0
 
 
 if __name__ == '__main__':
   logging.basicConfig(level=logging.WARNING)
   sys.exit(main(sys.argv))