Remove switch for container app key.
No longer used and can be removed from the code base. Bug: b:339671326 Change-Id: Iac0762ffb622b4b1d0df9ca02da19ba5282b9a3b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5599438 Reviewed-by: Xiyuan Xia <xiyuan@chromium.org> Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org> Commit-Queue: David Black <dmblack@google.com> Cr-Commit-Position: refs/heads/main@{#1310682}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
db6da6c412
commit
ab248d98e9
chrome/browser
chromeos/constants
@@ -11035,10 +11035,6 @@ const FeatureEntry kFeatureEntries[] = {
|
|||||||
flag_descriptions::kContainerDescription, kOsCrOS,
|
flag_descriptions::kContainerDescription, kOsCrOS,
|
||||||
FEATURE_VALUE_TYPE(chromeos::features::kContainerAppPreinstall)},
|
FEATURE_VALUE_TYPE(chromeos::features::kContainerAppPreinstall)},
|
||||||
|
|
||||||
{"container-contents", flag_descriptions::kContainerContentsName,
|
|
||||||
flag_descriptions::kContainerContentsDescription, kOsCrOS,
|
|
||||||
STRING_VALUE_TYPE(chromeos::switches::kContainerAppPreinstallKey, "")},
|
|
||||||
|
|
||||||
{"mahi", flag_descriptions::kMahiName, flag_descriptions::kMahiDescription,
|
{"mahi", flag_descriptions::kMahiName, flag_descriptions::kMahiDescription,
|
||||||
kOsCrOS, FEATURE_VALUE_TYPE(chromeos::features::kMahi)},
|
kOsCrOS, FEATURE_VALUE_TYPE(chromeos::features::kMahi)},
|
||||||
|
|
||||||
|
@@ -62,11 +62,6 @@ class ContainerAppTabHelperTest
|
|||||||
{chromeos::features::kFeatureManagementContainerAppPreinstall,
|
{chromeos::features::kFeatureManagementContainerAppPreinstall,
|
||||||
IsContainerAppPreinstallEnabled()},
|
IsContainerAppPreinstallEnabled()},
|
||||||
});
|
});
|
||||||
if (IsContainerAppPreinstallEnabled()) {
|
|
||||||
scoped_ignore_container_app_preinstall_key_ = std::make_unique<
|
|
||||||
base::AutoReset<bool>>(
|
|
||||||
chromeos::features::SetIgnoreContainerAppPreinstallKeyForTesting());
|
|
||||||
}
|
|
||||||
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
|
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||||
crosapi::mojom::BrowserInitParamsPtr init_params =
|
crosapi::mojom::BrowserInitParamsPtr init_params =
|
||||||
chromeos::BrowserInitParams::GetForTests()->Clone();
|
chromeos::BrowserInitParams::GetForTests()->Clone();
|
||||||
@@ -109,11 +104,6 @@ class ContainerAppTabHelperTest
|
|||||||
// Used to conditionally enable/disable the container app preinstallation
|
// Used to conditionally enable/disable the container app preinstallation
|
||||||
// feature based on test parameterization.
|
// feature based on test parameterization.
|
||||||
base::test::ScopedFeatureList scoped_feature_list_;
|
base::test::ScopedFeatureList scoped_feature_list_;
|
||||||
|
|
||||||
// Used to conditionally ignore the container app preinstallation key when
|
|
||||||
// the preinstallation feature is enabled.
|
|
||||||
std::unique_ptr<base::AutoReset<bool>>
|
|
||||||
scoped_ignore_container_app_preinstall_key_;
|
|
||||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -1495,11 +1495,6 @@
|
|||||||
"owners": [ "dmblack@google.com", "xiaohuic@chromium.org" ],
|
"owners": [ "dmblack@google.com", "xiaohuic@chromium.org" ],
|
||||||
"expiry_milestone": 130
|
"expiry_milestone": 130
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "container-contents",
|
|
||||||
"owners": [ "dmblack@google.com", "xiaohuic@chromium.org" ],
|
|
||||||
"expiry_milestone": 130
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "content-languages-in-language-picker",
|
"name": "content-languages-in-language-picker",
|
||||||
"owners": [
|
"owners": [
|
||||||
|
@@ -132,8 +132,6 @@ const char kComputePressureRateObfuscationMitigationDescription[] =
|
|||||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||||
const char kContainerName[] = "Container";
|
const char kContainerName[] = "Container";
|
||||||
const char kContainerDescription[] = "Enables container.";
|
const char kContainerDescription[] = "Enables container.";
|
||||||
const char kContainerContentsName[] = "Container Contents";
|
|
||||||
const char kContainerContentsDescription[] = "Contents for the container.";
|
|
||||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||||
|
|
||||||
const char kComputePressureBreakCalibrationMitigationName[] =
|
const char kComputePressureBreakCalibrationMitigationName[] =
|
||||||
|
@@ -120,8 +120,6 @@ extern const char kComputePressureBreakCalibrationMitigationDescription[];
|
|||||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||||
extern const char kContainerName[];
|
extern const char kContainerName[];
|
||||||
extern const char kContainerDescription[];
|
extern const char kContainerDescription[];
|
||||||
extern const char kContainerContentsName[];
|
|
||||||
extern const char kContainerContentsDescription[];
|
|
||||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||||
|
|
||||||
extern const char kContentLanguagesInLanguagePickerName[];
|
extern const char kContentLanguagesInLanguagePickerName[];
|
||||||
|
@@ -17,10 +17,6 @@ namespace {
|
|||||||
|
|
||||||
bool g_app_install_service_uri_enabled_for_testing = false;
|
bool g_app_install_service_uri_enabled_for_testing = false;
|
||||||
|
|
||||||
#if !BUILDFLAG(IS_CHROMEOS_LACROS)
|
|
||||||
bool g_ignore_container_app_preinstall_key_for_testing = false;
|
|
||||||
#endif // !BUILDFLAG(IS_CHROMEOS_LACROS)
|
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||||
@@ -582,10 +578,4 @@ base::AutoReset<bool> SetAppInstallServiceUriEnabledForTesting() {
|
|||||||
return {&g_app_install_service_uri_enabled_for_testing, true};
|
return {&g_app_install_service_uri_enabled_for_testing, true};
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !BUILDFLAG(IS_CHROMEOS_LACROS)
|
|
||||||
base::AutoReset<bool> SetIgnoreContainerAppPreinstallKeyForTesting() {
|
|
||||||
return {&g_ignore_container_app_preinstall_key_for_testing, true};
|
|
||||||
}
|
|
||||||
#endif // !BUILDFLAG(IS_CHROMEOS_LACROS)
|
|
||||||
|
|
||||||
} // namespace chromeos::features
|
} // namespace chromeos::features
|
||||||
|
@@ -179,11 +179,6 @@ bool IsMicrosoftOneDriveIntegrationForEnterpriseEnabled();
|
|||||||
[[nodiscard]] COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
|
[[nodiscard]] COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
|
||||||
base::AutoReset<bool> SetAppInstallServiceUriEnabledForTesting();
|
base::AutoReset<bool> SetAppInstallServiceUriEnabledForTesting();
|
||||||
|
|
||||||
#if !BUILDFLAG(IS_CHROMEOS_LACROS)
|
|
||||||
[[nodiscard]] COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
|
|
||||||
base::AutoReset<bool> SetIgnoreContainerAppPreinstallKeyForTesting();
|
|
||||||
#endif // !BUILDFLAG(IS_CHROMEOS_LACROS)
|
|
||||||
|
|
||||||
} // namespace features
|
} // namespace features
|
||||||
} // namespace chromeos
|
} // namespace chromeos
|
||||||
|
|
||||||
|
@@ -14,12 +14,6 @@ namespace chromeos::switches {
|
|||||||
const char kContainerAppPreinstallActivationTimeThreshold[] =
|
const char kContainerAppPreinstallActivationTimeThreshold[] =
|
||||||
"container-app-preinstall-activation-time-threshold";
|
"container-app-preinstall-activation-time-threshold";
|
||||||
|
|
||||||
#if !BUILDFLAG(IS_CHROMEOS_LACROS)
|
|
||||||
// The name for the command-line switch used to provide the key which gates
|
|
||||||
// preinstallation of the container app.
|
|
||||||
const char kContainerAppPreinstallKey[] = "container-app-preinstall-key";
|
|
||||||
#endif // !BUILDFLAG(IS_CHROMEOS_LACROS)
|
|
||||||
|
|
||||||
// Returns the value from the command-line switch for the activation time
|
// Returns the value from the command-line switch for the activation time
|
||||||
// threshold for the container app. Returns an absent value if the command-line
|
// threshold for the container app. Returns an absent value if the command-line
|
||||||
// switch isn't present or cannot be parsed. Note that this switch will only be
|
// switch isn't present or cannot be parsed. Note that this switch will only be
|
||||||
@@ -36,14 +30,4 @@ std::optional<base::Time> GetContainerAppPreinstallActivationTimeThreshold() {
|
|||||||
: std::nullopt;
|
: std::nullopt;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !BUILDFLAG(IS_CHROMEOS_LACROS)
|
|
||||||
// Returns the value from the command-line switch for the key which gates
|
|
||||||
// preinstallation of the container app. Returns an empty string if the
|
|
||||||
// command-line switch isn't present.
|
|
||||||
std::string GetContainerAppPreinstallKey() {
|
|
||||||
return base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
|
|
||||||
kContainerAppPreinstallKey);
|
|
||||||
}
|
|
||||||
#endif // !BUILDFLAG(IS_CHROMEOS_LACROS)
|
|
||||||
|
|
||||||
} // namespace chromeos::switches
|
} // namespace chromeos::switches
|
||||||
|
@@ -21,18 +21,9 @@ namespace chromeos::switches {
|
|||||||
COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
|
COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
|
||||||
extern const char kContainerAppPreinstallActivationTimeThreshold[];
|
extern const char kContainerAppPreinstallActivationTimeThreshold[];
|
||||||
|
|
||||||
#if !BUILDFLAG(IS_CHROMEOS_LACROS)
|
|
||||||
COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
|
|
||||||
extern const char kContainerAppPreinstallKey[];
|
|
||||||
#endif // !BUILDFLAG(IS_CHROMEOS_LACROS)
|
|
||||||
|
|
||||||
COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
|
COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
|
||||||
std::optional<base::Time> GetContainerAppPreinstallActivationTimeThreshold();
|
std::optional<base::Time> GetContainerAppPreinstallActivationTimeThreshold();
|
||||||
|
|
||||||
#if !BUILDFLAG(IS_CHROMEOS_LACROS)
|
|
||||||
COMPONENT_EXPORT(CHROMEOS_CONSTANTS) std::string GetContainerAppPreinstallKey();
|
|
||||||
#endif // !BUILDFLAG(IS_CHROMEOS_LACROS)
|
|
||||||
|
|
||||||
} // namespace chromeos::switches
|
} // namespace chromeos::switches
|
||||||
|
|
||||||
#endif // CHROMEOS_CONSTANTS_CHROMEOS_SWITCHES_H_
|
#endif // CHROMEOS_CONSTANTS_CHROMEOS_SWITCHES_H_
|
||||||
|
Reference in New Issue
Block a user