Switch to id-based affiliation determination

chrome/browser/chromeos/login/session/user_session_manager.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 "chrome/browser/chromeos/login/session/user_session_manager.h"
 
 #include <string>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 999 matching lines @@
   }
 
   BootTimesRecorder* btl = BootTimesRecorder::Get();
   btl->AddLoginTimeMarker("UserProfileGotten", false);
 
   if (user_context_.IsUsingOAuth()) {
     // Retrieve the policy that indicates whether to continue copying
     // authentication cookies set by a SAML IdP on subsequent logins after the
     // first.
     bool transfer_saml_auth_cookies_on_subsequent_login = false;
-    if (has_auth_cookies_ &&
-        g_browser_process->platform_part()->
-            browser_policy_connector_chromeos()->GetUserAffiliation(user_id) ==
-                policy::USER_AFFILIATION_MANAGED) {
-      CrosSettings::Get()->GetBoolean(
-          kAccountsPrefTransferSAMLCookies,
-          &transfer_saml_auth_cookies_on_subsequent_login);
+    if (has_auth_cookies_) {
+      const user_manager::User* user =
+          user_manager::UserManager::Get()->FindUser(user_id);
+      if (user->is_affiliated()) {
+        CrosSettings::Get()->GetBoolean(
+            kAccountsPrefTransferSAMLCookies,
+            &transfer_saml_auth_cookies_on_subsequent_login);
+      }
     }
 
     // Transfers authentication-related data from the profile that was used for
     // authentication to the user's profile. The proxy authentication state is
     // transferred unconditionally. If the user authenticated via an auth
     // extension, authentication cookies and channel IDs will be transferred as
     // well when the user's cookie jar is empty. If the cookie jar is not empty,
     // the authentication states in the browser context and the user's profile
     // must be merged using /MergeSession instead. Authentication cookies set by
     // a SAML IdP will also be transferred when the user's cookie jar is not
@@ skipping 719 matching lines @@
   token_handle_util_.reset();
 }
 
 void UserSessionManager::CreateTokenUtilIfMissing() {
   if (!token_handle_util_.get())
     token_handle_util_.reset(
         new TokenHandleUtil(user_manager::UserManager::Get()));
 }
 
 }  // namespace chromeos