summaryrefslogtreecommitdiffstats
path: root/components/components_tests.gyp
diff options
context:
space:
mode:
authorBartosz Fabianowski <bartfab@google.com>2016-03-04 14:10:00 +0100
committerBartosz Fabianowski <bartfab@google.com>2016-03-04 13:12:21 +0000
commit91a11d2194db3fddd16c2ad03b1655afb1a5503c (patch)
tree5ba4b8f6985e1966768bb935cf16dc19a2d04231 /components/components_tests.gyp
parentaa11d808c8ac8a5f689ec06ee4cf00f6c8ae5685 (diff)
downloadchromium_src-91a11d2194db3fddd16c2ad03b1655afb1a5503c.zip
chromium_src-91a11d2194db3fddd16c2ad03b1655afb1a5503c.tar.gz
chromium_src-91a11d2194db3fddd16c2ad03b1655afb1a5503c.tar.bz2
Fixed affiliation for device local accounts.
BUG=580713 When switched to id-based affiliation determination, device local accounts appeared to be unaffiliated, though they must be affiliated. The solution is override IsAffiliated() function for device local accounts and make it always return "true". Review URL: https://codereview.chromium.org/1680153002 Cr-Commit-Position: refs/heads/master@{#376987} (cherry picked from commit c8452f23a2742025d74b26f79cc62e947b237c4a) Review URL: https://codereview.chromium.org/1764983002 . Cr-Commit-Position: refs/branch-heads/2623@{#575} Cr-Branched-From: 92d77538a86529ca35f9220bd3cd512cbea1f086-refs/heads/master@{#369907}
Diffstat (limited to 'components/components_tests.gyp')
-rw-r--r--components/components_tests.gyp4
1 files changed, 4 insertions, 0 deletions
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index fc03b143..0b8541f 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -799,6 +799,9 @@
'url_matcher/url_matcher_factory_unittest.cc',
'url_matcher/url_matcher_unittest.cc',
],
+ 'user_manager_unittest_sources': [
+ 'user_manager/user_unittest.cc',
+ ],
'variations_unittest_sources': [
'variations/active_field_trials_unittest.cc',
'variations/caching_permuted_entropy_provider_unittest.cc',
@@ -1416,6 +1419,7 @@
'wifi_sync/wifi_security_class_unittest.cc',
'<@(metrics_leak_detector_unittest_sources)',
'<@(ownership_unittest_sources)',
+ '<@(user_manager_unittest_sources)',
],
'sources!': [
'signin/core/browser/signin_status_metrics_provider_unittest.cc',