Updated SessionManagerClient to use the multi-profile user policy calls.

chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

 // Copyright (c) 2013 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_factory_chromeos.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
-#include "chrome/browser/policy/cloud/cloud_policy_manager.h"
 #include "chrome/browser/policy/cloud/device_management_service.h"
 #include "chrome/browser/policy/cloud/resource_cache.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "chromeos/chromeos_paths.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "net/url_request/url_request_context_getter.h"
 
@@ skipping 62 matching lines @@
   if (chromeos::ProfileHelper::IsSigninProfile(profile))
     return scoped_ptr<UserCloudPolicyManagerChromeOS>();
 
   // |user| should never be NULL except for the signin profile. This object is
   // created as part of the Profile creation, which happens right after
   // sign-in. The just-signed-in User is the active user during that time.
   chromeos::UserManager* user_manager = chromeos::UserManager::Get();
   chromeos::User* user = user_manager->GetActiveUser();
   CHECK(user);
 
-  // TODO(joaodasilva): Initialize user policy for all accounts once the session
-  // manager is ready for multi-profile policy. Note that there can still be
-  // only one delegate for the global user policy provider.
-  // http://crbug.com/230349
-  const bool is_primary_user =
-      chromeos::UserManager::Get()->GetLoggedInUsers().size() == 1;
   // Only USER_TYPE_REGULAR users have user cloud policy.
   // USER_TYPE_RETAIL_MODE, USER_TYPE_KIOSK_APP and USER_TYPE_GUEST are not
   // signed in and can't authenticate the policy registration.
   // USER_TYPE_PUBLIC_ACCOUNT gets its policy from the
   // DeviceLocalAccountPolicyService.
   // USER_TYPE_LOCALLY_MANAGED gets its policy from the
   // ManagedModePolicyProvider.
   const std::string& username = user->email();
-  if (!is_primary_user ||
-      user->GetType() != chromeos::User::USER_TYPE_REGULAR ||
+  if (user->GetType() != chromeos::User::USER_TYPE_REGULAR ||
       BrowserPolicyConnector::IsNonEnterpriseUser(username)) {
     return scoped_ptr<UserCloudPolicyManagerChromeOS>();
   }
 
   BrowserPolicyConnector* connector =
       g_browser_process->browser_policy_connector();
   UserAffiliation affiliation = connector->GetUserAffiliation(username);
   const bool is_managed_user = affiliation == USER_AFFILIATION_MANAGED;
   const bool is_browser_restart =
       command_line->HasSwitch(chromeos::switches::kLoginUser) &&
@@ skipping 54 matching lines @@
   ProfileKeyedBaseFactory::ProfileDestroyed(context);
 }
 
 void UserCloudPolicyManagerFactoryChromeOS::SetEmptyTestingFactory(
     content::BrowserContext* context) {}
 
 void UserCloudPolicyManagerFactoryChromeOS::CreateServiceNow(
     content::BrowserContext* context) {}
 
 }  // namespace policy