Commit 597f4937 authored by Anastasiia Nikolaienko's avatar Anastasiia Nikolaienko Committed by Commit Bot

Account Manager cleanup: remove enabling AM in tests

Account Manager is enabled by default now. Merge
ChromeOsMirrorAccountConsistencyTestWithAccountManagerEnabled
to ChromeOsMirrorAccountConsistency tests.

Bug: 1007927
Change-Id: Ic3362561c8a9cc0696b8420994ba087b44015f79
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1824102
Commit-Queue: Anastasiia Nikolaienko <anastasiian@chromium.org>
Reviewed-by: default avatarKush Sinha <sinhak@chromium.org>
Reviewed-by: default avatarDavid Roger <droger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#700655}
parent 86e75433
...@@ -143,37 +143,15 @@ IN_PROC_BROWSER_TEST_F(ChromeOsMirrorAccountConsistencyTest, ...@@ -143,37 +143,15 @@ IN_PROC_BROWSER_TEST_F(ChromeOsMirrorAccountConsistencyTest,
"consistency_enabled_by_default=false"); "consistency_enabled_by_default=false");
} }
class ChromeOsMirrorAccountConsistencyTestWithAccountManagerEnabled IN_PROC_BROWSER_TEST_F(ChromeOsMirrorAccountConsistencyTest,
: public ChromeOsMirrorAccountConsistencyTest { PRE_TestMirrorRequestChromeOsNotChildAccount) {
public:
ChromeOsMirrorAccountConsistencyTestWithAccountManagerEnabled() = default;
~ChromeOsMirrorAccountConsistencyTestWithAccountManagerEnabled() override =
default;
void SetUp() override {
scoped_feature_list_.InitAndEnableFeature(
chromeos::features::kAccountManager);
ChromeOsMirrorAccountConsistencyTest::SetUp();
}
private:
base::test::ScopedFeatureList scoped_feature_list_;
DISALLOW_COPY_AND_ASSIGN(
ChromeOsMirrorAccountConsistencyTestWithAccountManagerEnabled);
};
IN_PROC_BROWSER_TEST_F(
ChromeOsMirrorAccountConsistencyTestWithAccountManagerEnabled,
PRE_TestMirrorRequestChromeOsNotChildAccount) {
RegisterUser(account_id_); RegisterUser(account_id_);
chromeos::StartupUtils::MarkOobeCompleted(); chromeos::StartupUtils::MarkOobeCompleted();
} }
// Mirror is not enabled for non-child accounts. // Mirror is enabled for non-child accounts.
IN_PROC_BROWSER_TEST_F( IN_PROC_BROWSER_TEST_F(ChromeOsMirrorAccountConsistencyTest,
ChromeOsMirrorAccountConsistencyTestWithAccountManagerEnabled, TestMirrorRequestChromeOsNotChildAccount) {
TestMirrorRequestChromeOsNotChildAccount) {
// Not a child user. // Not a child user.
LoginUser(account_id_); LoginUser(account_id_);
......
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