Skip to content

Commit

Permalink
[Lacros] Expose LacrosMode status in LacrosInfo
Browse files Browse the repository at this point in the history 
This CL adds the `LacrosMode` in the `LacrosInfo` struct that is exposed
by `autotest_private_api` to tast tests. So that tast tests can use
`LacrosInfo` to figure out whether it's testing against Lacros Only or
Lacros Primary, or any other listed  mode. The four supported modes are
`Disabled`, `SideBySide`, `Primary` and `Only`.

Ultimately, this CL is one of a series of CLs that enable tast tests to
test LacrosOnly scenarios.

Bug: 1328994,1328851
Change-Id: I29747b3e0c462e50bda560819fd1079cd5908f47
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3783852
Reviewed-by: Ben Wells <benwells@chromium.org>
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Commit-Queue: Di Wu <diwux@google.com>
Cr-Commit-Position: refs/heads/main@{#1032436}
  • Loading branch information
Di Wu authored and Chromium LUCI CQ committed Aug 8, 2022
1 parent 2b76cbc commit 9d2f70d
Show file tree
Hide file tree
Showing 6 changed files with 134 additions and 3 deletions.
10 changes: 10 additions & 0 deletions chrome/browser/ash/crosapi/browser_util.cc
View file
Expand Up @@ -628,6 +628,16 @@ bool IsLacrosPrimaryBrowserForMigration(const user_manager::User* user,
return base::FeatureList::IsEnabled(chromeos::features::kLacrosPrimary);
}

LacrosMode GetLacrosMode() {
if (!IsAshWebBrowserEnabled())
return LacrosMode::kOnly;
if (IsLacrosPrimaryBrowser())
return LacrosMode::kPrimary;
if (IsLacrosEnabled())
return LacrosMode::kSideBySide;
return LacrosMode::kDisabled;
}

void SetLacrosPrimaryBrowserForTest(absl::optional<bool> value) {
g_lacros_primary_browser_for_test = value;
}
Expand Down
22 changes: 22 additions & 0 deletions chrome/browser/ash/crosapi/browser_util.h
View file
Expand Up @@ -97,6 +97,24 @@ enum class MigrationMode {
kMove = 1, // Migrate using `MoveMigrator`.
};

// Specifies the mode Lacros is currently running.
// This enum is different from LacrosAvailability in the way that
// it describes the mode Lacros is running at a given point in time
// which can be influenced by multiple factors such as flags,
// while LacrosAvailability describes the policy that dictates how
// Lacros is supposed to be launched.
enum class LacrosMode {
// Indicates that Lacros is disabled. Ash is the only browser.
kDisabled = 0,
// Indicates that Lacros is enabled but Ash browser is the
// primary browser.
kSideBySide = 1,
// Indicates that Lacros is the primary browser. Ash is also available.
kPrimary = 2,
// Indicates that Lacros is the only available browser.
kOnly = 3,
};

extern const ComponentInfo kLacrosDogfoodCanaryInfo;
extern const ComponentInfo kLacrosDogfoodDevInfo;
extern const ComponentInfo kLacrosDogfoodBetaInfo;
Expand Down Expand Up @@ -207,6 +225,10 @@ bool IsLacrosPrimaryBrowser();
bool IsLacrosPrimaryBrowserForMigration(const user_manager::User* user,
PolicyInitState policy_init_state);

// Returns the current mode Lacros is running.
// See LacrosMode definition for a full list of modes.
LacrosMode GetLacrosMode();

// Forces IsLacrosPrimaryBrowser() to return true or false for testing.
// Passing absl::nullopt will reset the state.
void SetLacrosPrimaryBrowserForTest(absl::optional<bool> value);
Expand Down
72 changes: 70 additions & 2 deletions chrome/browser/ash/crosapi/browser_util_unittest.cc
View file
Expand Up @@ -404,14 +404,27 @@ TEST_F(BrowserUtilTest, IsAshWebBrowserDisabledByFlags) {
}
}

TEST_F(LacrosSupportBrowserUtilTest, LacrosPrimaryBrowserByFlags) {
TEST_F(LacrosSupportBrowserUtilTest, LacrosPrimaryOrOnlyBrowserByFlags) {
AddRegularUser("user@test.com");
const user_manager::User* const user =
ash::ProfileHelper::Get()->GetUserByProfile(&testing_profile_);
{
EXPECT_FALSE(browser_util::IsLacrosPrimaryBrowser());
EXPECT_FALSE(browser_util::IsLacrosPrimaryBrowserForMigration(
user, browser_util::PolicyInitState::kAfterInit));
EXPECT_EQ(browser_util::LacrosMode::kDisabled,
browser_util::GetLacrosMode());
}

// Just enabling LacrosSupport feature is not enough.
{
base::test::ScopedFeatureList feature_list;
feature_list.InitAndEnableFeature(chromeos::features::kLacrosSupport);
EXPECT_FALSE(browser_util::IsLacrosPrimaryBrowser());
EXPECT_FALSE(browser_util::IsLacrosPrimaryBrowserForMigration(
user, browser_util::PolicyInitState::kAfterInit));
EXPECT_EQ(browser_util::LacrosMode::kSideBySide,
browser_util::GetLacrosMode());
}

// Just enabling LacrosPrimary feature is not enough.
Expand All @@ -421,9 +434,11 @@ TEST_F(LacrosSupportBrowserUtilTest, LacrosPrimaryBrowserByFlags) {
EXPECT_FALSE(browser_util::IsLacrosPrimaryBrowser());
EXPECT_FALSE(browser_util::IsLacrosPrimaryBrowserForMigration(
user, browser_util::PolicyInitState::kAfterInit));
EXPECT_EQ(browser_util::LacrosMode::kDisabled,
browser_util::GetLacrosMode());
}

// Both LacrosPrimary and LacrosSupport are needed.
// Both LacrosPrimary and LacrosSupport are needed for LacrosPrimary
{
base::test::ScopedFeatureList feature_list;
feature_list.InitWithFeatures({chromeos::features::kLacrosPrimary,
Expand All @@ -432,6 +447,21 @@ TEST_F(LacrosSupportBrowserUtilTest, LacrosPrimaryBrowserByFlags) {
EXPECT_TRUE(browser_util::IsLacrosPrimaryBrowser());
EXPECT_TRUE(browser_util::IsLacrosPrimaryBrowserForMigration(
user, browser_util::PolicyInitState::kAfterInit));
EXPECT_EQ(browser_util::LacrosMode::kPrimary,
browser_util::GetLacrosMode());
}

// All LacrosPrimary, LacrosOnly and LacrosSupport are needed for LacrosOnly
{
base::test::ScopedFeatureList feature_list;
feature_list.InitWithFeatures(
{chromeos::features::kLacrosPrimary, chromeos::features::kLacrosSupport,
chromeos::features::kLacrosOnly},
{});
EXPECT_TRUE(browser_util::IsLacrosPrimaryBrowser());
EXPECT_TRUE(browser_util::IsLacrosPrimaryBrowserForMigration(
user, browser_util::PolicyInitState::kAfterInit));
EXPECT_EQ(browser_util::LacrosMode::kOnly, browser_util::GetLacrosMode());
}
}

Expand All @@ -449,6 +479,7 @@ TEST_F(BrowserUtilTest, LacrosPrimaryBrowser) {
EXPECT_TRUE(browser_util::IsLacrosPrimaryBrowser());
EXPECT_TRUE(browser_util::IsLacrosPrimaryBrowserForMigration(
user, browser_util::PolicyInitState::kAfterInit));
EXPECT_EQ(browser_util::LacrosMode::kPrimary, browser_util::GetLacrosMode());
}

TEST_F(BrowserUtilTest, LacrosPrimaryBrowserAllowed) {
Expand Down Expand Up @@ -476,6 +507,8 @@ TEST_F(BrowserUtilTest, ManagedAccountLacrosPrimary) {
EXPECT_FALSE(browser_util::IsLacrosPrimaryBrowser());
EXPECT_FALSE(browser_util::IsLacrosPrimaryBrowserForMigration(
user, browser_util::PolicyInitState::kAfterInit));
EXPECT_EQ(browser_util::LacrosMode::kDisabled,
browser_util::GetLacrosMode());
}

{
Expand All @@ -486,6 +519,8 @@ TEST_F(BrowserUtilTest, ManagedAccountLacrosPrimary) {
EXPECT_FALSE(browser_util::IsLacrosPrimaryBrowser());
EXPECT_FALSE(browser_util::IsLacrosPrimaryBrowserForMigration(
user, browser_util::PolicyInitState::kAfterInit));
EXPECT_EQ(browser_util::LacrosMode::kSideBySide,
browser_util::GetLacrosMode());
}

{
Expand All @@ -496,6 +531,8 @@ TEST_F(BrowserUtilTest, ManagedAccountLacrosPrimary) {
EXPECT_TRUE(browser_util::IsLacrosPrimaryBrowser());
EXPECT_TRUE(browser_util::IsLacrosPrimaryBrowserForMigration(
user, browser_util::PolicyInitState::kAfterInit));
EXPECT_EQ(browser_util::LacrosMode::kPrimary,
browser_util::GetLacrosMode());
}

{
Expand All @@ -506,6 +543,7 @@ TEST_F(BrowserUtilTest, ManagedAccountLacrosPrimary) {
EXPECT_TRUE(browser_util::IsLacrosPrimaryBrowser());
EXPECT_TRUE(browser_util::IsLacrosPrimaryBrowserForMigration(
user, browser_util::PolicyInitState::kAfterInit));
EXPECT_EQ(browser_util::LacrosMode::kOnly, browser_util::GetLacrosMode());
}
}

Expand Down Expand Up @@ -997,6 +1035,36 @@ TEST_F(BrowserUtilTest, LacrosGoogleRolloutPrimary) {
EXPECT_TRUE(browser_util::IsLacrosPrimaryBrowser());
EXPECT_TRUE(browser_util::IsLacrosPrimaryBrowserForMigration(
user, browser_util::PolicyInitState::kAfterInit));
// What you see here is Finch overrides policy.
// This is due to a special logic only to Googlers.
// See IsAshWebBrowserEnabled() impl for more details.
EXPECT_EQ(browser_util::LacrosMode::kOnly, browser_util::GetLacrosMode());
EXPECT_FALSE(browser_util::IsAshWebBrowserEnabled());
EXPECT_FALSE(browser_util::IsAshWebBrowserEnabledForMigration(
user, browser_util::PolicyInitState::kAfterInit));
}

TEST_F(BrowserUtilTest, LacrosGoogleRolloutOnly) {
AddRegularUser("user@google.com");
const user_manager::User* const user =
ash::ProfileHelper::Get()->GetUserByProfile(&testing_profile_);
// Lacros availability is set by policy to only.
ScopedLacrosAvailabilityCache cache(LacrosAvailability::kLacrosOnly);

// We enable 3 features: LacrosSupport, LacrosPrimary, LacrosOnly
base::test::ScopedFeatureList feature_list;
feature_list.InitWithFeatures(
{chromeos::features::kLacrosSupport, chromeos::features::kLacrosPrimary,
chromeos::features::kLacrosOnly},
{});

// Check that Lacros is allowed, enabled, and set to lacros-only.
EXPECT_TRUE(browser_util::IsLacrosAllowedToBeEnabled());
EXPECT_TRUE(browser_util::IsLacrosEnabled());
EXPECT_TRUE(browser_util::IsLacrosPrimaryBrowser());
EXPECT_TRUE(browser_util::IsLacrosPrimaryBrowserForMigration(
user, browser_util::PolicyInitState::kAfterInit));
EXPECT_EQ(browser_util::LacrosMode::kOnly, browser_util::GetLacrosMode());
EXPECT_FALSE(browser_util::IsAshWebBrowserEnabled());
EXPECT_FALSE(browser_util::IsAshWebBrowserEnabledForMigration(
user, browser_util::PolicyInitState::kAfterInit));
Expand Down
18 changes: 18 additions & 0 deletions chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.cc
View file
Expand Up @@ -1972,6 +1972,22 @@ AutotestPrivateGetLacrosInfoFunction::ToLacrosState(
}
}

// static
api::autotest_private::LacrosMode
AutotestPrivateGetLacrosInfoFunction::ToLacrosMode(
crosapi::browser_util::LacrosMode lacrosMode) {
switch (lacrosMode) {
case crosapi::browser_util::LacrosMode::kDisabled:
return api::autotest_private::LacrosMode::LACROS_MODE_DISABLED;
case crosapi::browser_util::LacrosMode::kSideBySide:
return api::autotest_private::LacrosMode::LACROS_MODE_SIDEBYSIDE;
case crosapi::browser_util::LacrosMode::kPrimary:
return api::autotest_private::LacrosMode::LACROS_MODE_PRIMARY;
case crosapi::browser_util::LacrosMode::kOnly:
return api::autotest_private::LacrosMode::LACROS_MODE_ONLY;
}
}

ExtensionFunction::ResponseAction AutotestPrivateGetLacrosInfoFunction::Run() {
DVLOG(1) << "AutotestPrivateGetLacrosInfoFunction";
auto* browser_manager = crosapi::BrowserManager::Get();
Expand All @@ -1981,6 +1997,8 @@ ExtensionFunction::ResponseAction AutotestPrivateGetLacrosInfoFunction::Run() {
result->SetBoolKey("isKeepAlive", browser_manager->IsKeepAliveEnabled());
result->SetStringKey("lacrosPath",
browser_manager->lacros_path().MaybeAsASCII());
result->SetStringKey("mode", api::autotest_private::ToString(ToLacrosMode(
crosapi::browser_util::GetLacrosMode())));
return RespondNow(
OneArgument(base::Value::FromUniquePtrValue(std::move(result))));
}
Expand Down
2 changes: 2 additions & 0 deletions chrome/browser/chromeos/extensions/autotest_private/autotest_private_api.h
View file
Expand Up @@ -336,6 +336,8 @@ class AutotestPrivateGetLacrosInfoFunction : public ExtensionFunction {
ResponseAction Run() override;
static api::autotest_private::LacrosState ToLacrosState(
crosapi::BrowserManager::State state);
static api::autotest_private::LacrosMode ToLacrosMode(
crosapi::browser_util::LacrosMode lacrosMode);
};

class AutotestPrivateGetArcAppFunction : public ExtensionFunction {
Expand Down
13 changes: 12 additions & 1 deletion chrome/common/extensions/api/autotest_private.idl
View file
Expand Up @@ -265,7 +265,7 @@ namespace autotestPrivate {

callback IsLacrosPrimaryBrowserCallback = void (boolean primary);

// crosapi::BrowserManager::State
// A mapping of crosapi::BrowserManager::State
enum LacrosState {
NotInitialized,
Mounting,
Expand All @@ -277,6 +277,14 @@ namespace autotestPrivate {
Terminating
};

// A mapping of crosapi::browser_util::LacrosMode
enum LacrosMode {
Disabled,
SideBySide,
Primary,
Only
};

dictionary LacrosInfo {
// The state of lacros.
LacrosState state;
Expand All @@ -285,6 +293,9 @@ namespace autotestPrivate {
// Path to lacros-chrome directory. Note that this may change over time if
// omaha is used. This also may be empty if lacros is not running.
DOMString lacrosPath;
// Specifies the mode Lacros is currently running.
// For a full list of supported mode, see LacrosMode enum definition.
LacrosMode lacrosMode;
};

callback GetLacrosInfoCallback = void (LacrosInfo info);
Expand Down

0 comments on commit 9d2f70d

Please sign in to comment.