Commit 759cc85c authored by cfredric's avatar cfredric Committed by Commit Bot

Remove unused user_data_dir argument.

Change-Id: I1ad064b9da87821b578d9f183a7a78ba8da5929a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2393056
Auto-Submit: Chris Fredrickson <cfredric@google.com>
Reviewed-by: default avatarDavid Van Cleve <davidvc@chromium.org>
Reviewed-by: default avatarJoshua Pawlicki <waffles@chromium.org>
Commit-Queue: Joshua Pawlicki <waffles@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804904}
parent f67f6444
...@@ -125,6 +125,7 @@ void RegisterComponentsForUpdate(bool is_off_the_record_profile, ...@@ -125,6 +125,7 @@ void RegisterComponentsForUpdate(bool is_off_the_record_profile,
RegisterOnDeviceHeadSuggestComponent( RegisterOnDeviceHeadSuggestComponent(
cus, g_browser_process->GetApplicationLocale()); cus, g_browser_process->GetApplicationLocale());
RegisterOptimizationHintsComponent(cus, is_off_the_record_profile); RegisterOptimizationHintsComponent(cus, is_off_the_record_profile);
RegisterTrustTokenKeyCommitmentsComponentIfTrustTokensEnabled(cus);
base::FilePath path; base::FilePath path;
if (base::PathService::Get(chrome::DIR_USER_DATA, &path)) { if (base::PathService::Get(chrome::DIR_USER_DATA, &path)) {
...@@ -151,7 +152,6 @@ void RegisterComponentsForUpdate(bool is_off_the_record_profile, ...@@ -151,7 +152,6 @@ void RegisterComponentsForUpdate(bool is_off_the_record_profile,
RegisterFileTypePoliciesComponent(cus, path); RegisterFileTypePoliciesComponent(cus, path);
RegisterTrustTokenKeyCommitmentsComponentIfTrustTokensEnabled(cus, path);
RegisterSSLErrorAssistantComponent(cus, path); RegisterSSLErrorAssistantComponent(cus, path);
} }
......
...@@ -166,8 +166,7 @@ TrustTokenKeyCommitmentsComponentInstallerPolicy::GetMimeTypes() const { ...@@ -166,8 +166,7 @@ TrustTokenKeyCommitmentsComponentInstallerPolicy::GetMimeTypes() const {
} }
void RegisterTrustTokenKeyCommitmentsComponentIfTrustTokensEnabled( void RegisterTrustTokenKeyCommitmentsComponentIfTrustTokensEnabled(
ComponentUpdateService* cus, ComponentUpdateService* cus) {
const base::FilePath& user_data_dir) {
if (!base::FeatureList::IsEnabled(network::features::kTrustTokens)) if (!base::FeatureList::IsEnabled(network::features::kTrustTokens))
return; return;
......
...@@ -73,8 +73,7 @@ class TrustTokenKeyCommitmentsComponentInstallerPolicy ...@@ -73,8 +73,7 @@ class TrustTokenKeyCommitmentsComponentInstallerPolicy
// Call once during startup to make the component update service aware of // Call once during startup to make the component update service aware of
// the component. // the component.
void RegisterTrustTokenKeyCommitmentsComponentIfTrustTokensEnabled( void RegisterTrustTokenKeyCommitmentsComponentIfTrustTokensEnabled(
ComponentUpdateService* cus, ComponentUpdateService* cus);
const base::FilePath& user_data_dir);
} // namespace component_updater } // namespace component_updater
......
...@@ -47,8 +47,7 @@ TEST_F(TrustTokenKeyCommitmentsComponentInstallerTest, FeatureDisabled) { ...@@ -47,8 +47,7 @@ TEST_F(TrustTokenKeyCommitmentsComponentInstallerTest, FeatureDisabled) {
auto service = auto service =
std::make_unique<component_updater::MockComponentUpdateService>(); std::make_unique<component_updater::MockComponentUpdateService>();
EXPECT_CALL(*service, RegisterComponent(_)).Times(0); EXPECT_CALL(*service, RegisterComponent(_)).Times(0);
RegisterTrustTokenKeyCommitmentsComponentIfTrustTokensEnabled( RegisterTrustTokenKeyCommitmentsComponentIfTrustTokensEnabled(service.get());
service.get(), component_install_dir_.GetPath());
env_.RunUntilIdle(); env_.RunUntilIdle();
} }
......
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