Switch to id-based affiliation determination

chrome/browser/chromeos/policy/blocking_login_browsertest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
@@ skipping 225 matching lines @@
   EXPECT_FALSE(profile_added_);
 
   // Enroll the device, if enrollment is enabled for this test instance.
   if (GetParam().enroll_device) {
     EnrollDevice(kUsername);
 
     EXPECT_FALSE(user_manager->IsUserLoggedIn());
     EXPECT_TRUE(browser_policy_connector()->IsEnterpriseManaged());
     EXPECT_EQ(kDomain, browser_policy_connector()->GetEnterpriseDomain());
     EXPECT_FALSE(profile_added_);
-    EXPECT_EQ(policy::USER_AFFILIATION_MANAGED,
-              browser_policy_connector()->GetUserAffiliation(kUsername));
     RunUntilIdle();
     EXPECT_FALSE(user_manager->IsKnownUser(kUsername));
   }
 
   // Skip the OOBE, go to the sign-in screen, and wait for the login screen to
   // become visible.
   WaitForSigninScreen();
   EXPECT_FALSE(profile_added_);
 
   // Prepare the fake HTTP responses.
@@ skipping 62 matching lines @@
     {3, kUsernameOtherDomain, true},
     {4, kUsernameOtherDomain, true},
     {5, kUsernameOtherDomain, true},
 };
 
 INSTANTIATE_TEST_CASE_P(BlockingLoginTestInstance,
                         BlockingLoginTest,
                         testing::ValuesIn(kBlockinLoginTestCases));
 
 }  // namespace chromeos