Add option to provision_devices script to disable location.

build/android/provision_devices.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2013 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.
 
 """Provisions Android devices with settings required for bots.
 
 Usage:
   ./provision_devices.py [-d <device serial number>]
@@ skipping 128 matching lines @@
     except errors.DeviceUnresponsiveError:
       pass
     for device_serial in devices:
       device.WaitUntilFullyBooted(timeout=90)
 
   # Provision devices
   for device_serial in devices:
     device = device_utils.DeviceUtils(device_serial)
     device.old_interface.EnableAdbRoot()
     _ConfigureLocalProperties(device)
-    device_settings.ConfigureContentSettingsDict(
-        device, device_settings.DETERMINISTIC_DEVICE_SETTINGS)
+    device_settings_map = device_settings.DETERMINISTIC_DEVICE_SETTINGS
+    if options.disable_location:
+      device_settings_map.update(device_settings.DISABLE_LOCATION_SETTING)
+    else:
+      device_settings_map.update(device_settings.ENABLE_LOCATION_SETTING)
+    device_settings.ConfigureContentSettingsDict(device, device_settings_map)
     if 'perf' in os.environ.get('BUILDBOT_BUILDERNAME', '').lower():
       # TODO(tonyg): We eventually want network on. However, currently radios
       # can cause perfbots to drain faster than they charge.
       device_settings.ConfigureContentSettingsDict(
           device, device_settings.NETWORK_DISABLED_SETTINGS)
       # Some perf bots run benchmarks with USB charging disabled which leads
       # to gradual draining of the battery. We must wait for a full charge
       # before starting a run in order to keep the devices online.
       try:
         battery_info = device.old_interface.GetBatteryInfo()
@@ skipping 27 matching lines @@
   if options.auto_reconnect:
     PushAndLaunchAdbReboot(devices, options.target)
 
 
 def main(argv):
   logging.basicConfig(level=logging.INFO)
 
   parser = optparse.OptionParser()
   parser.add_option('--skip-wipe', action='store_true', default=False,
                     help="Don't wipe device data during provisioning.")
+  parser.add_option('--disable-location', action='store_true', default=False,
+                    help="Disallow Google location services on devices.")
   parser.add_option('-d', '--device',
                     help='The serial number of the device to be provisioned')
   parser.add_option('-t', '--target', default='Debug', help='The build target')
   parser.add_option(
       '-r', '--auto-reconnect', action='store_true',
       help='Push binary which will reboot the device on adb disconnections.')
   options, args = parser.parse_args(argv[1:])
   constants.SetBuildType(options.target)
 
   if args:
     print >> sys.stderr, 'Unused args %s' % args
     return 1
 
   ProvisionDevices(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))