| Index: chrome/browser/chromeos/login/session/user_session_manager.cc
|
| diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc
|
| index ee137a63f671d94410b5744d6278306e13b7ed4f..cefdeca89ed52474db84cd2e8fffc84c794f2ce5 100644
|
| --- a/chrome/browser/chromeos/login/session/user_session_manager.cc
|
| +++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
|
| @@ -49,6 +49,7 @@
|
| #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
|
| #include "chrome/browser/chromeos/profiles/profile_helper.h"
|
| #include "chrome/browser/chromeos/settings/cros_settings.h"
|
| +#include "chrome/browser/component_updater/ev_whitelist_component_installer.h"
|
| #include "chrome/browser/first_run/first_run.h"
|
| #include "chrome/browser/google/google_brand_chromeos.h"
|
| #include "chrome/browser/lifetime/application_lifetime.h"
|
| @@ -967,6 +968,7 @@ void UserSessionManager::FinalizePrepareProfile(Profile* profile) {
|
| InitRlz(profile);
|
| InitializeCerts(profile);
|
| InitializeCRLSetFetcher(user);
|
| + InitializeEVCertificatesWhitelistComponent(user);
|
| }
|
|
|
| UpdateEasyUnlockKeys(user_context_);
|
| @@ -1196,6 +1198,18 @@ void UserSessionManager::InitializeCRLSetFetcher(
|
| }
|
| }
|
|
|
| +void UserSessionManager::InitializeEVCertificatesWhitelistComponent(
|
| + const user_manager::User* user) {
|
| + const std::string username_hash = user->username_hash();
|
| + component_updater::ComponentUpdateService* cus =
|
| + g_browser_process->component_updater();
|
| + if (!username_hash.empty() && cus) {
|
| + const base::FilePath path =
|
| + ProfileHelper::GetProfilePathByUserIdHash(username_hash);
|
| + RegisterEVWhitelistComponent(cus, path);
|
| + }
|
| +}
|
| +
|
| void UserSessionManager::OnRestoreActiveSessions(
|
| const SessionManagerClient::ActiveSessionsMap& sessions,
|
| bool success) {
|
|
|