diff options
| author | aberent <aberent@chromium.org> | 2015-07-24 05:53:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-24 12:54:29 +0000 |
| commit | 1adc137bc1bc1d8cadf5f691dc3a4da2848eb7ed (patch) | |
| tree | 06c4916ead1628c015ed38ada751c98163ce47fe /components/components_tests.gyp | |
| parent | cc15bf26827fcef7e7f583e11fcb4dd749c6732e (diff) | |
| download | chromium_src-1adc137bc1bc1d8cadf5f691dc3a4da2848eb7ed.zip chromium_src-1adc137bc1bc1d8cadf5f691dc3a4da2848eb7ed.tar.gz chromium_src-1adc137bc1bc1d8cadf5f691dc3a4da2848eb7ed.tar.bz2 | |
Read Android policies early in startup
The IO thread constructor reads preferences that are set from policies, so Chrome
should read the policies before the IO thread constructor is called.
Two parts to this:
1 - create a persistant policy cache and read it cache synchronously
2 - reorder various things so that the Android PolicyManager and PolicyProviders
are created earlier in startup.
Also merge (C++) PolicyProviderAndroid into PolicyManager and add Junit tests
for the Java PolicyManager.
TBR=nyquist
BUG=510813
Review URL: https://codereview.chromium.org/1239323002
Cr-Commit-Position: refs/heads/master@{#340265}
Diffstat (limited to 'components/components_tests.gyp')
| -rw-r--r-- | components/components_tests.gyp | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/components/components_tests.gyp b/components/components_tests.gyp index afa86ee..09d599f 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -396,6 +396,7 @@ 'password_manager/core/common/credential_manager_types_unittest.cc', ], 'policy_unittest_sources': [ + 'policy/core/browser/android/android_combined_policy_provider_unittest.cc', 'policy/core/browser/android/policy_converter_unittest.cc', 'policy/core/browser/autofill_policy_handler_unittest.cc', 'policy/core/browser/browser_policy_connector_unittest.cc', @@ -429,7 +430,6 @@ 'policy/core/common/policy_loader_mac_unittest.cc', 'policy/core/common/policy_loader_win_unittest.cc', 'policy/core/common/policy_map_unittest.cc', - 'policy/core/common/policy_provider_android_unittest.cc', 'policy/core/common/policy_service_impl_unittest.cc', 'policy/core/common/policy_statistics_collector_unittest.cc', 'policy/core/common/preg_parser_win_unittest.cc', @@ -990,6 +990,7 @@ 'conditions': [ ['OS=="android"', { 'dependencies': [ + 'components.gyp:policy_java', '../build/android/ndk.gyp:cpu_features', ], }], @@ -1556,6 +1557,25 @@ }, 'includes': [ '../build/apk_test.gypi' ], }, + { + 'target_name': 'components_junit_tests', + 'type': 'none', + 'dependencies': [ + 'components.gyp:invalidation_java', + 'components.gyp:policy_java', + '../base/base.gyp:base_java', + '../base/base.gyp:base_java_test_support', + '../testing/android/junit/junit_test.gyp:junit_test_support', + ], + 'variables': { + 'main_class': 'org.chromium.testing.local.JunitTestMain', + 'src_paths': [ + 'invalidation/impl/android/junit/', + 'policy/android/junit/' + ], + }, + 'includes': [ '../build/host_jar.gypi' ], + }, ], }], ], |