| 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 f261b818f712288a9ad2195b193234bf3c94171f..12bf4e7f3f440467aca4ccddf9ca8ec89194e859 100644
|
| --- a/chrome/browser/chromeos/login/session/user_session_manager.cc
|
| +++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
|
| @@ -40,7 +40,6 @@
|
| #include "chrome/browser/google/google_brand_chromeos.h"
|
| #include "chrome/browser/lifetime/application_lifetime.h"
|
| #include "chrome/browser/net/crl_set_fetcher.h"
|
| -#include "chrome/browser/net/nss_context.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| #include "chrome/browser/rlz/rlz.h"
|
| @@ -48,7 +47,6 @@
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/logging_chrome.h"
|
| #include "chrome/common/pref_names.h"
|
| -#include "chromeos/cert_loader.h"
|
| #include "chromeos/chromeos_switches.h"
|
| #include "chromeos/cryptohome/cryptohome_util.h"
|
| #include "chromeos/dbus/cryptohome_client.h"
|
| @@ -158,15 +156,6 @@ base::FilePath GetRlzDisabledFlagPath() {
|
| }
|
| #endif
|
|
|
| -// Callback to GetNSSCertDatabaseForProfile. It starts CertLoader using the
|
| -// provided NSS database. It must be called for primary user only.
|
| -void OnGetNSSCertDatabaseForUser(net::NSSCertDatabase* database) {
|
| - if (!CertLoader::IsInitialized())
|
| - return;
|
| -
|
| - CertLoader::Get()->StartWithNSSDB(database);
|
| -}
|
| -
|
| } // namespace
|
|
|
| #if defined(ENABLE_RLZ)
|
| @@ -774,7 +763,6 @@ void UserSessionManager::FinalizePrepareProfile(Profile* profile) {
|
| ProfileHelper::Get()->GetUserByProfile(profile);
|
| if (user_manager->GetPrimaryUser() == user) {
|
| InitRlz(profile);
|
| - InitializeCerts(profile);
|
| InitializeCRLSetFetcher(user);
|
| }
|
|
|
| @@ -882,15 +870,6 @@ void UserSessionManager::InitRlzImpl(Profile* profile, bool disabled) {
|
| #endif
|
| }
|
|
|
| -void UserSessionManager::InitializeCerts(Profile* profile) {
|
| - // Now that the user profile has been initialized
|
| - // |GetNSSCertDatabaseForProfile| is safe to be used.
|
| - if (CertLoader::IsInitialized() && base::SysInfo::IsRunningOnChromeOS()) {
|
| - GetNSSCertDatabaseForProfile(profile,
|
| - base::Bind(&OnGetNSSCertDatabaseForUser));
|
| - }
|
| -}
|
| -
|
| void UserSessionManager::InitializeCRLSetFetcher(
|
| const user_manager::User* user) {
|
| const std::string username_hash = user->username_hash();
|
|
|