Commit af69db63 authored by nancy's avatar nancy Committed by Commit Bot

Remove kAppServiceAsh from Crostini test.

kAppServiceAsh is the flag to integrate AppService in UI app_list.
Since it has been enabled for a few months for M78, M79 release, it
should not be disabled, so the flag kAppServiceAsh can be removed.

BUG=1016159

Change-Id: I0235521beb53bdda1b50c07e8a6e4e11298ba71c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1895254Reviewed-by: default avatarJoel Hockey <joelhockey@chromium.org>
Commit-Queue: Nancy Wang <nancylingwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#712039}
parent d32986ad
...@@ -108,22 +108,20 @@ void CrostiniTestHelper::ReInitializeAppServiceIntegration() { ...@@ -108,22 +108,20 @@ void CrostiniTestHelper::ReInitializeAppServiceIntegration() {
chromeos::DBusThreadManager::Initialize(); chromeos::DBusThreadManager::Initialize();
} }
if (base::FeatureList::IsEnabled(features::kAppServiceAsh)) { // The App Service is originally initialized when the Profile is created,
// The App Service is originally initialized when the Profile is created, // but this class' constructor takes the Profile* as an argument, which
// but this class' constructor takes the Profile* as an argument, which // means that the fake user (created during that constructor) is
// means that the fake user (created during that constructor) is // necessarily configured after the App Service's initialization.
// necessarily configured after the App Service's initialization. //
// // Without further action, in tests (but not in production which looks at
// Without further action, in tests (but not in production which looks at // real users, not fakes), the App Service serves no Crostini apps, as at
// real users, not fakes), the App Service serves no Crostini apps, as at // the time it looked, the profile/user doesn't have Crostini enabled.
// the time it looked, the profile/user doesn't have Crostini enabled. //
// // We therefore manually have the App Service re-examine whether Crostini
// We therefore manually have the App Service re-examine whether Crostini // is enabled for this profile.
// is enabled for this profile. auto* proxy = apps::AppServiceProxyFactory::GetForProfile(profile_);
auto* proxy = apps::AppServiceProxyFactory::GetForProfile(profile_); proxy->ReInitializeCrostiniForTesting(profile_);
proxy->ReInitializeCrostiniForTesting(profile_); proxy->FlushMojoCallsForTesting();
proxy->FlushMojoCallsForTesting();
}
} }
void CrostiniTestHelper::UpdateAppKeywords( void CrostiniTestHelper::UpdateAppKeywords(
......
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