Chromium Code Reviews| Index: build/android/pylib/device_settings.py |
| diff --git a/build/android/pylib/device_settings.py b/build/android/pylib/device_settings.py |
| index 2c2adcefcda0633e894128e634d7dc662d96c9c3..0c0a280bd9c4587a1d1dc32072d2995abbf8a61c 100644 |
| --- a/build/android/pylib/device_settings.py |
| +++ b/build/android/pylib/device_settings.py |
| @@ -47,6 +47,20 @@ def ConfigureContentSettingsDict(device, desired_settings): |
| logging.info('\t%s: %s', key, value) |
| +ENABLE_LOCATION_SETTING = { |
| + 'settings/secure': { |
| + # Ensure Geolocation is enabled and allowed for tests. |
| + 'location_providers_allowed': 'gps,network', |
| + } |
| +} |
| + |
| +DISABLE_LOCATION_SETTING = { |
| + 'settings/secure': { |
| + # Ensure Geolocation is enabled and allowed for tests. |
|
Ted C
2014/06/19 22:55:53
s/enabled and allowed for tests/disabled
navabi
2014/06/19 23:10:44
Done.
|
| + 'location_providers_allowed': '', |
| + } |
| +} |
| + |
| DETERMINISTIC_DEVICE_SETTINGS = { |
| 'com.google.settings/partner': { |
| 'network_location_opt_in': 0, |
| @@ -83,9 +97,6 @@ DETERMINISTIC_DEVICE_SETTINGS = { |
| # receives the injected user input events). |
| 'anr_show_background': 0, |
| - # Ensure Geolocation is enabled and allowed for tests. |
| - 'location_providers_allowed': 'gps,network', |
| - |
| 'lockscreen.disabled': 1, |
| 'screensaver_enabled': 0, |