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

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

Index: chrome/browser/chromeos/login/users/affiliation_unittest.cc
diff --git a/chrome/browser/chromeos/login/users/affiliation_unittest.cc b/chrome/browser/chromeos/login/users/affiliation_unittest.cc
index 1ab758eaec82ce2bfe48d8182553db6b358916d7..21dfcf96d09a746d4daa13662a3061644681162a 100644
--- a/chrome/browser/chromeos/login/users/affiliation_unittest.cc
+++ b/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, "", ""));

[peletskyi, 2016/09/28 14:08:53]

I'd leave this test case of the not valid email.

[Thiemo Nagel, 2016/09/28 14:13:45]

I've just moved them to the bottom to also check that invalid email overrides id
match.

+  // Empty affiliation IDs.
+  EXPECT_FALSE(IsUserAffiliated(user_ids, device_ids, "user@managed.com"));
 
-  EXPECT_FALSE(IsUserAffiliated(user_ids, device_ids, "user", ""));

[peletskyi, 2016/09/28 14:08:53]

And this

[Thiemo Nagel, 2016/09/28 14:13:45]

see above

-
-  // 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