Commit a409c98d authored by cfredric's avatar cfredric Committed by Commit Bot

Remove unused user_data_dir parameter.

Change-Id: Iabb1bdac97627239293f4077631ad0519876da56
Bug: 1126207
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2398944
Commit-Queue: Chris Fredrickson <cfredric@google.com>
Reviewed-by: default avatarAlexander Alekseev <alemate@chromium.org>
Reviewed-by: default avatarJoshua Pawlicki <waffles@chromium.org>
Auto-Submit: Chris Fredrickson <cfredric@google.com>
Cr-Commit-Position: refs/heads/master@{#805341}
parent 29bbccd9
...@@ -99,7 +99,7 @@ void UserSessionInitializer::OnUserProfileLoaded(const AccountId& account_id) { ...@@ -99,7 +99,7 @@ void UserSessionInitializer::OnUserProfileLoaded(const AccountId& account_id) {
if (user_manager::UserManager::Get()->GetPrimaryUser() == user) { if (user_manager::UserManager::Get()->GetPrimaryUser() == user) {
InitRlz(profile); InitRlz(profile);
InitializeCerts(profile); InitializeCerts(profile);
InitializeCRLSetFetcher(user); InitializeCRLSetFetcher();
InitializeCertificateTransparencyComponents(user); InitializeCertificateTransparencyComponents(user);
InitializePrimaryProfileServices(profile, user); InitializePrimaryProfileServices(profile, user);
...@@ -152,17 +152,11 @@ void UserSessionInitializer::InitializeCerts(Profile* profile) { ...@@ -152,17 +152,11 @@ void UserSessionInitializer::InitializeCerts(Profile* profile) {
} }
} }
void UserSessionInitializer::InitializeCRLSetFetcher( void UserSessionInitializer::InitializeCRLSetFetcher() {
const user_manager::User* user) { component_updater::ComponentUpdateService* cus =
const std::string username_hash = user->username_hash(); g_browser_process->component_updater();
if (!username_hash.empty()) { if (cus)
base::FilePath path = component_updater::RegisterCRLSetComponent(cus);
ProfileHelper::GetProfilePathByUserIdHash(username_hash);
component_updater::ComponentUpdateService* cus =
g_browser_process->component_updater();
if (cus)
component_updater::RegisterCRLSetComponent(cus, path);
}
} }
void UserSessionInitializer::InitializeCertificateTransparencyComponents( void UserSessionInitializer::InitializeCertificateTransparencyComponents(
......
...@@ -60,7 +60,7 @@ class UserSessionInitializer : public session_manager::SessionManagerObserver { ...@@ -60,7 +60,7 @@ class UserSessionInitializer : public session_manager::SessionManagerObserver {
void InitializeCerts(Profile* profile); void InitializeCerts(Profile* profile);
// Starts loading CRL set. // Starts loading CRL set.
void InitializeCRLSetFetcher(const user_manager::User* user); void InitializeCRLSetFetcher();
// Initializes Certificate Transparency-related components. // Initializes Certificate Transparency-related components.
void InitializeCertificateTransparencyComponents( void InitializeCertificateTransparencyComponents(
......
...@@ -163,8 +163,7 @@ std::vector<std::string> CRLSetPolicy::GetMimeTypes() const { ...@@ -163,8 +163,7 @@ std::vector<std::string> CRLSetPolicy::GetMimeTypes() const {
return std::vector<std::string>(); return std::vector<std::string>();
} }
void RegisterCRLSetComponent(ComponentUpdateService* cus, void RegisterCRLSetComponent(ComponentUpdateService* cus) {
const base::FilePath& user_data_dir) {
auto installer = base::MakeRefCounted<ComponentInstaller>( auto installer = base::MakeRefCounted<ComponentInstaller>(
std::make_unique<CRLSetPolicy>()); std::make_unique<CRLSetPolicy>());
installer->Register(cus, base::OnceClosure()); installer->Register(cus, base::OnceClosure());
......
...@@ -65,8 +65,7 @@ class CRLSetPolicy : public ComponentInstallerPolicy { ...@@ -65,8 +65,7 @@ class CRLSetPolicy : public ComponentInstallerPolicy {
// Registers a CRLSet component with |cus|. On a new CRLSet update, the default // Registers a CRLSet component with |cus|. On a new CRLSet update, the default
// Network Service, returned by content::GetNetworkService(), will be updated // Network Service, returned by content::GetNetworkService(), will be updated
// with the new CRLSet. // with the new CRLSet.
void RegisterCRLSetComponent(ComponentUpdateService* cus, void RegisterCRLSetComponent(ComponentUpdateService* cus);
const base::FilePath& user_data_dir);
} // namespace component_updater } // namespace component_updater
......
...@@ -141,17 +141,16 @@ void RegisterComponentsForUpdate(bool is_off_the_record_profile, ...@@ -141,17 +141,16 @@ void RegisterComponentsForUpdate(bool is_off_the_record_profile,
component_updater::DeleteLegacySTHSet(path); component_updater::DeleteLegacySTHSet(path);
#endif #endif
#if !defined(OS_CHROMEOS)
// CRLSetFetcher attempts to load a CRL set from either the local disk or
// network.
// For Chrome OS this registration is delayed until user login.
component_updater::RegisterCRLSetComponent(cus, path);
#endif // !defined(OS_CHROMEOS)
RegisterOriginTrialsComponent(cus, path); RegisterOriginTrialsComponent(cus, path);
} }
RegisterSSLErrorAssistantComponent(cus); RegisterSSLErrorAssistantComponent(cus);
RegisterFileTypePoliciesComponent(cus); RegisterFileTypePoliciesComponent(cus);
#if !defined(OS_CHROMEOS)
// CRLSetFetcher attempts to load a CRL set from either the local disk or
// network.
// For Chrome OS this registration is delayed until user login.
component_updater::RegisterCRLSetComponent(cus);
#endif // !defined(OS_CHROMEOS)
RegisterMediaEngagementPreloadComponent(cus, base::OnceClosure()); RegisterMediaEngagementPreloadComponent(cus, base::OnceClosure());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment