Added affiliation IDs for the new affiliation determination.

chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc

Index: chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc
index ff817c71a819052790cd7a62732041dbaa7c876c..456b27aada915808ba97a1265f03967dd7e4238a 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 
+#include <set>
+
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
@@ -14,6 +16,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
+#include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h"
 #include "chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
 #include "chrome/browser/chromeos/policy/wildcard_login_checker.h"
@@ -274,6 +277,21 @@ void UserCloudPolicyManagerChromeOS::OnComponentCloudPolicyUpdated() {
   StartRefreshSchedulerIfReady();
 }
 
+void UserCloudPolicyManagerChromeOS::OnStoreLoaded(
+    CloudPolicyStore* cloud_policy_store) {
+  CloudPolicyManager::OnStoreLoaded(cloud_policy_store);
+
+  em::PolicyData const* const policy_data = cloud_policy_store->policy();
+  if (policy_data) {
+    std::set<std::string> set_of_user_affiliation_ids(
+        policy_data->user_affiliation_ids().begin(),
+        policy_data->user_affiliation_ids().end());
+
+    chromeos::ChromeUserManager::Get()->SetUserAffiliation(
+        policy_data->username(), set_of_user_affiliation_ids);

[Mattias Nissler (ping if slow), 2015/07/30 12:10:57]

Do we need to canonicalize the user name here? We've had problems in the past
where upper/lower case spelling mismatches caused policy validation errors, you
might run into the same problem here.

[peletskyi, 2015/07/30 14:10:57]

Done.

+  }
+}
+
 void UserCloudPolicyManagerChromeOS::GetChromePolicy(PolicyMap* policy_map) {
   CloudPolicyManager::GetChromePolicy(policy_map);