| Index: chrome/browser/chromeos/login/users/affiliation.cc
|
| diff --git a/chrome/browser/chromeos/login/users/affiliation.cc b/chrome/browser/chromeos/login/users/affiliation.cc
|
| index 85852e56720500de0870ee1ccde1f226687bf91b..4330afcce50385b6e8af909ace5b4fa60eb4a01d 100644
|
| --- a/chrome/browser/chromeos/login/users/affiliation.cc
|
| +++ b/chrome/browser/chromeos/login/users/affiliation.cc
|
| @@ -28,12 +28,10 @@ bool HaveCommonElement(const std::set<std::string>& set1,
|
|
|
| bool IsUserAffiliated(const AffiliationIDSet& user_affiliation_ids,
|
| const AffiliationIDSet& device_affiliation_ids,
|
| - const std::string& email,
|
| - const std::string& enterprise_domain) {
|
| - // An empty username means incognito user in case of ChromiumOS and
|
| - // no logged-in user in case of Chromium (SigninService). Many tests use
|
| - // nonsense email addresses (e.g. 'test') so treat those as non-enterprise
|
| - // users.
|
| + const std::string& email) {
|
| + // An empty username means incognito user in case of Chrome OS and no
|
| + // logged-in user in case of Chrome (SigninService). Many tests use nonsense
|
| + // email addresses (e.g. 'test') so treat those as non-enterprise users.
|
| if (email.empty() || email.find('@') == std::string::npos) {
|
| return false;
|
| }
|
| @@ -46,12 +44,6 @@ bool IsUserAffiliated(const AffiliationIDSet& user_affiliation_ids,
|
| return HaveCommonElement(user_affiliation_ids, device_affiliation_ids);
|
| }
|
|
|
| - // TODO(peletskyi): Remove the following backwards compatibility part.
|
| - if (gaia::ExtractDomainName(gaia::CanonicalizeEmail(email)) ==
|
| - enterprise_domain) {
|
| - return true;
|
| - }
|
| -
|
| return false;
|
| }
|
|
|
|
|