Added affiliation IDs for the new affiliation determination.

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

Index: chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
index 6cdf4b8b7590d1bf93e697480f119cf4516a0d63..10a54fe39672ce12c73a5a7224bb25eec06929dc 100644
--- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
@@ -29,6 +29,7 @@
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/browser/chromeos/login/signin/auth_sync_observer.h"
 #include "chrome/browser/chromeos/login/signin/auth_sync_observer_factory.h"
+#include "chrome/browser/chromeos/login/users/affiliation.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h"
 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
 #include "chrome/browser/chromeos/login/users/supervised_user_manager_impl.h"
@@ -94,6 +95,7 @@ void ChromeUserManagerImpl::RegisterPrefs(PrefRegistrySimple* registry) {
 
   registry->RegisterListPref(kPublicAccounts);
   registry->RegisterStringPref(kPublicAccountPendingDataRemoval, std::string());
+
   SupervisedUserManager::RegisterPrefs(registry);
   SessionLengthLimiter::RegisterPrefs(registry);
   BootstrapManager::RegisterPrefs(registry);
@@ -1121,4 +1123,21 @@ void ChromeUserManagerImpl::UpdateUserTimeZoneRefresher(Profile* profile) {
   }
 }
 
+void ChromeUserManagerImpl::SetUserAffiliation(
+    const std::string& user_id,
+    const std::set<std::string>& user_affiliation_ids) {
+  LOG(ERROR) << "SetUserAffiliation is not implemented yet. Called for user: "

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

remove LOG lines

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

Done.

+             << user_id;
+  user_manager::User* user = FindUserAndModify(user_id);
+  if (user) {
+    policy::BrowserPolicyConnectorChromeOS const* const connector =
+        g_browser_process->platform_part()->browser_policy_connector_chromeos();
+    LOG(ERROR) << "Affiliation to set: "

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

You should actually set the affiliation here by calling User->SetAffiliation().
Any reason to not add User::SetAffiliation and the corresponding getter in this
CL?

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

Done.

+               << chromeos::IsUserAffiliated(
+                      user_affiliation_ids,
+                      connector->GetDeviceAffiliationIDs(), user_id,
+                      connector->GetEnterpriseDomain());
+  }
+}
+
 }  // namespace chromeos