Remove IsUserAffiliated()'s obsolete dependency on enrollment domain.

The fallback isn't needed anymore because DM server has been updated to
send affiliation ids.

BUG=515476
TEST=updated unittest

Review-Url: https://codereview.chromium.org/2378043002
Cr-Commit-Position: refs/heads/master@{#423832}

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;
 }
 

chrome/browser/chromeos/login/users/affiliation.h

@@ -18,15 +18,14 @@ typedef std::set<std::string> AffiliationIDSet;
 bool HaveCommonElement(const std::set<std::string>& set1,
                        const std::set<std::string>& set2);
 
-// TODO(peletskyi): Remove email and enterprise domain after affiliation
-// based implementation will fully work. http://crbug.com/515476
+// TODO(peletskyi): Remove email after affiliation based implementation will
+// fully work. http://crbug.com/515476
 // The function makes a decision if user with |user_affiliation_ids| and
 // |email| is affiliated on the device with |device_affiliation_ids| and
 // |enterprise_domain|.
 bool IsUserAffiliated(const AffiliationIDSet& user_affiliation_ids,
                       const AffiliationIDSet& device_affiliation_ids,
-                      const std::string& email,
-                      const std::string& enterprise_domain);
+                      const std::string& email);
 
 }  // namespace chromeos
 

chrome/browser/chromeos/login/users/affiliation_unittest.cc

@@ -78,31 +78,22 @@ TEST(AffiliationTest, Generic) {
   AffiliationIDSet user_ids;    // User affiliation IDs.
   AffiliationIDSet device_ids;  // Device affiliation IDs.
 
-  EXPECT_FALSE(IsUserAffiliated(user_ids, device_ids, "", ""));
+  // Empty affiliation IDs.
+  EXPECT_FALSE(IsUserAffiliated(user_ids, device_ids, "user@managed.com"));
 
-  EXPECT_FALSE(IsUserAffiliated(user_ids, device_ids, "user", ""));
-
-  // Not valid email.
-  EXPECT_FALSE(IsUserAffiliated(user_ids, device_ids, "user", "user"));
-
-  EXPECT_FALSE(IsUserAffiliated(user_ids, device_ids, "user@notmanaged.com",
-                                "managed.com"));
-
-  EXPECT_TRUE(IsUserAffiliated(user_ids, device_ids, "user@managed.com",
-                               "managed.com"));
-
-  user_ids.insert("aaaa");  // Only user affiliation IDs present. Compare email.
-  EXPECT_TRUE(IsUserAffiliated(user_ids, device_ids, "user@managed.com",
-                               "managed.com"));
+  user_ids.insert("aaaa");  // Only user affiliation IDs present.
+  EXPECT_FALSE(IsUserAffiliated(user_ids, device_ids, "user@managed.com"));
 
   device_ids.insert("bbbb");  // Device and user IDs do not overlap.
-  EXPECT_FALSE(IsUserAffiliated(user_ids, device_ids, "user@managed.com",
-                                "managed.com"));
+  EXPECT_FALSE(IsUserAffiliated(user_ids, device_ids, "user@managed.com"));
 
   user_ids.insert("cccc");  // Device and user IDs do overlap.
   device_ids.insert("cccc");
-  EXPECT_TRUE(IsUserAffiliated(user_ids, device_ids, "user@notmanaged.com",
-                               "managed.com"));
+  EXPECT_TRUE(IsUserAffiliated(user_ids, device_ids, "user@managed.com"));
+
+  // Invalid email overrides match of affiliation IDs.
+  EXPECT_FALSE(IsUserAffiliated(user_ids, device_ids, ""));
+  EXPECT_FALSE(IsUserAffiliated(user_ids, device_ids, "user"));
 }
 
 }  // namespace chromeos

chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc

@@ -1213,7 +1213,7 @@ void ChromeUserManagerImpl::SetUserAffiliation(
         g_browser_process->platform_part()->browser_policy_connector_chromeos();
     const bool is_affiliated = chromeos::IsUserAffiliated(
         user_affiliation_ids, connector->GetDeviceAffiliationIDs(),
-        account_id.GetUserEmail(), connector->GetEnterpriseDomain());
+        account_id.GetUserEmail());
     user->SetAffiliation(is_affiliated);
 
     if (user->GetType() == user_manager::USER_TYPE_REGULAR) {