| Index: chrome/browser/profiles/profile_io_data.cc
|
| diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
|
| index 6c78ef52d89d320afddc804e79763d681bd72647..0264dc462fad974da0e4978db07775b5a2ee072f 100644
|
| --- a/chrome/browser/profiles/profile_io_data.cc
|
| +++ b/chrome/browser/profiles/profile_io_data.cc
|
| @@ -124,7 +124,6 @@
|
| #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h"
|
| #include "chrome/browser/chromeos/net/client_cert_filter_chromeos.h"
|
| #include "chrome/browser/chromeos/net/client_cert_store_chromeos.h"
|
| -#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
|
| #include "chrome/browser/chromeos/policy/policy_cert_service.h"
|
| #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
|
| #include "chrome/browser/chromeos/policy/policy_cert_verifier.h"
|
| @@ -445,14 +444,9 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) {
|
| user->username_hash(),
|
| profile->GetPath()));
|
|
|
| - // Use the device-wide system key slot only if the user is of the same
|
| - // domain as the device is registered to.
|
| - policy::BrowserPolicyConnectorChromeOS* connector =
|
| - g_browser_process->platform_part()
|
| - ->browser_policy_connector_chromeos();
|
| - params->use_system_key_slot =
|
| - connector->GetUserAffiliation(user->email()) ==
|
| - policy::USER_AFFILIATION_MANAGED;
|
| + // Use the device-wide system key slot only if the user is affiliated on
|
| + // the device.
|
| + params->use_system_key_slot = user->is_affiliated();
|
| }
|
| }
|
|
|
|
|