Added affiliation IDs for the new affiliation determination.

chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc

 // Copyright (c) 2012 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/policy/user_cloud_policy_manager_chromeos.h"
 
+#include <set>
+
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/sequenced_task_runner.h"
 #include "base/values.h"
 #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"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/common/chrome_content_client.h"
 #include "components/policy/core/common/cloud/cloud_external_data_manager.h"
 #include "components/policy/core/common/cloud/cloud_policy_refresh_scheduler.h"
 #include "components/policy/core/common/cloud/device_management_service.h"
 #include "components/policy/core/common/cloud/system_policy_request_context.h"
 #include "components/policy/core/common/policy_map.h"
@@ skipping 36 matching lines @@
     // TODO(mnissler): This only removes the user pod from the login screen, but
     // the cryptohome remains. This is because deleting the cryptohome for a
     // logged-in session is not possible. Fix this either by delaying the
     // cryptohome deletion operation or by getting rid of the in-session
     // wildcard check.
     user_manager::UserManager::Get()->RemoveUserFromList(username);
     chrome::AttemptUserExit();
   }
 }
 
+std::set<std::string> AffiliationIDsToSet(const em::PolicyData& policy_data) {

[Mattias Nissler (ping if slow), 2015/07/29 20:08:13]

No need to break out into a separate function.

[peletskyi, 2015/07/30 11:02:27]

Done.

+  std::set<std::string> set_of_ids;
+  for (int i = 0; i < policy_data.user_affiliation_ids_size(); ++i) {
+    set_of_ids.insert(policy_data.user_affiliation_ids(i));
+  }

[Mattias Nissler (ping if slow), 2015/07/29 20:08:13]

You can just use std::set::insert as noted in the other comment.

[peletskyi, 2015/07/30 11:02:27]

Done.

+  return set_of_ids;
+}
+
 }  // namespace
 
 UserCloudPolicyManagerChromeOS::UserCloudPolicyManagerChromeOS(
     scoped_ptr<CloudPolicyStore> store,
     scoped_ptr<CloudExternalDataManager> external_data_manager,
     const base::FilePath& component_policy_cache_path,
     bool wait_for_policy_fetch,
     base::TimeDelta initial_policy_fetch_timeout,
     const scoped_refptr<base::SequencedTaskRunner>& task_runner,
     const scoped_refptr<base::SequencedTaskRunner>& file_task_runner,
@@ skipping 184 matching lines @@
                                 cloud_policy_client->status());
   }
   CancelWaitForPolicyFetch();
 }
 
 void UserCloudPolicyManagerChromeOS::OnComponentCloudPolicyUpdated() {
   CloudPolicyManager::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 && chromeos::ChromeUserManager::Get()) {

[Mattias Nissler (ping if slow), 2015/07/29 20:08:13]

Add a comment explaining when and why ChromeUserManager can return NULL. If this
is just to avoid crashes in tests, consider setting up a user manager in tests.

[peletskyi, 2015/07/30 11:02:27]

No case when ChromeUserManager is NULL found. Condition removed.

+    LOG(ERROR) << "Add user affiliation_ids for " << policy_data->username();
+    chromeos::ChromeUserManager::Get()->SetUserAffiliation(
+        policy_data->username(), AffiliationIDsToSet(*policy_data));
+  }
+}
+
 void UserCloudPolicyManagerChromeOS::GetChromePolicy(PolicyMap* policy_map) {
   CloudPolicyManager::GetChromePolicy(policy_map);
 
   // If the store has a verified policy blob received from the server then apply
   // the defaults for policies that haven't been configured by the administrator
   // given that this is an enterprise user.
   if (!store()->has_policy())
     return;
   SetEnterpriseUsersDefaults(policy_map);
 }
@@ skipping 109 matching lines @@
     // OnComponentCloudPolicyUpdated() once it's ready.
     return;
   }
 
   core()->StartRefreshScheduler();
   core()->TrackRefreshDelayPref(local_state_,
                                 policy_prefs::kUserPolicyRefreshRate);
 }
 
 }  // namespace policy