diff options
Diffstat (limited to 'chromium/components/signin/core/browser/signin_header_helper_unittest.cc')
| -rw-r--r-- | chromium/components/signin/core/browser/signin_header_helper_unittest.cc | 49 |
1 files changed, 35 insertions, 14 deletions
diff --git a/chromium/components/signin/core/browser/signin_header_helper_unittest.cc b/chromium/components/signin/core/browser/signin_header_helper_unittest.cc index 52df4a179aa..3884e498914 100644 --- a/chromium/components/signin/core/browser/signin_header_helper_unittest.cc +++ b/chromium/components/signin/core/browser/signin_header_helper_unittest.cc @@ -19,6 +19,7 @@ #include "components/signin/core/browser/chrome_connected_header_helper.h" #include "components/signin/public/base/account_consistency_method.h" #include "components/signin/public/base/signin_buildflags.h" +#include "components/signin/public/base/signin_switches.h" #include "components/signin/public/identity_manager/tribool.h" #include "components/sync_preferences/testing_pref_service_syncable.h" #include "google_apis/gaia/gaia_urls.h" @@ -153,6 +154,14 @@ class SigninHeaderHelperTest : public testing::Test { } #endif + std::string consistency_enabled_by_default_value() const { +#if BUILDFLAG(IS_CHROMEOS_LACROS) + return "true"; +#else + return "false"; +#endif + } + base::test::TaskEnvironment task_environment_; bool sync_enabled_ = false; @@ -164,6 +173,8 @@ class SigninHeaderHelperTest : public testing::Test { sync_preferences::TestingPrefServiceSyncable prefs_; #if BUILDFLAG(IS_CHROMEOS_LACROS) + base::test::ScopedFeatureList scoped_feature_list_{ + switches::kLacrosNonSyncingProfiles}; std::unique_ptr<chromeos::ScopedLacrosServiceTestHelper> scoped_lacros_test_helper_; #endif // BUILDFLAG(IS_CHROMEOS_LACROS) @@ -180,13 +191,15 @@ TEST_F(SigninHeaderHelperTest, TestMirrorRequestNoAccountIdChromeOS) { GURL("https://docs.google.com"), /*gaia_id=*/"", /*is_child_account=*/Tribool::kUnknown, "source=TestSource,mode=0,enable_account_consistency=true," - "consistency_enabled_by_default=false"); + "consistency_enabled_by_default=" + + consistency_enabled_by_default_value()); CheckMirrorCookieRequest(GURL("https://docs.google.com"), /*gaia_id=*/"", "mode=0:enable_account_consistency=true:" - "consistency_enabled_by_default=false"); + "consistency_enabled_by_default=" + + consistency_enabled_by_default_value()); } #else // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) // Tests that eligible_for_consistency request is returned on Android // when reaching to Gaia origin and there's no primary account. TEST_F(SigninHeaderHelperTest, TestEligibleForConsistencyRequestGaiaOrigin) { @@ -219,7 +232,7 @@ TEST_F(SigninHeaderHelperTest, TestForceAccountConsistencyMobile) { "source=TestSource,mode=0,enable_account_consistency=true," "consistency_enabled_by_default=false"); } -#endif // defined(OS_ANDROID) +#endif // BUILDFLAG(IS_ANDROID) // Tests that no Mirror request is returned when the user is not signed in (no // account id), for non Chrome OS platforms. @@ -257,10 +270,12 @@ TEST_F(SigninHeaderHelperTest, TestMirrorRequestGoogleTLD) { GURL("https://google.fr"), "0123456789", /*is_child_account=*/Tribool::kUnknown, "source=TestSource,mode=0,enable_account_consistency=true," - "consistency_enabled_by_default=false"); + "consistency_enabled_by_default=" + + consistency_enabled_by_default_value()); CheckMirrorCookieRequest(GURL("https://google.de"), "0123456789", "mode=0:enable_account_consistency=true:" - "consistency_enabled_by_default=false"); + "consistency_enabled_by_default=" + + consistency_enabled_by_default_value()); } // Tests that the Mirror request is returned when the target is the domain @@ -271,10 +286,12 @@ TEST_F(SigninHeaderHelperTest, TestMirrorRequestGoogleCom) { GURL("https://www.google.com"), "0123456789", /*is_child_account=*/Tribool::kUnknown, "source=TestSource,mode=0,enable_account_consistency=true," - "consistency_enabled_by_default=false"); + "consistency_enabled_by_default=" + + consistency_enabled_by_default_value()); CheckMirrorCookieRequest(GURL("https://www.google.com"), "0123456789", "mode=0:enable_account_consistency=true:" - "consistency_enabled_by_default=false"); + "consistency_enabled_by_default=" + + consistency_enabled_by_default_value()); } // Tests that no header sent when mirror account consistency is nor requested. @@ -305,7 +322,8 @@ TEST_F(SigninHeaderHelperTest, TestMirrorRequestGoogleComProfileConsistency) { CheckAccountConsistencyHeaderRequest( request_adapter.GetFinalHeaders(), kChromeConnectedHeader, "source=TestSource,mode=0,enable_account_consistency=true," - "consistency_enabled_by_default=false"); + "consistency_enabled_by_default=" + + consistency_enabled_by_default_value()); } TEST_F(SigninHeaderHelperTest, TestMirrorRequestGoogleComSupervised) { @@ -314,17 +332,20 @@ TEST_F(SigninHeaderHelperTest, TestMirrorRequestGoogleComSupervised) { GURL("https://www.google.com"), "0123456789", /*is_child_account=*/Tribool::kUnknown, "source=TestSource,mode=0,enable_account_consistency=true," - "consistency_enabled_by_default=false"); + "consistency_enabled_by_default=" + + consistency_enabled_by_default_value()); CheckMirrorHeaderRequest( GURL("https://www.google.com"), "0123456789", /*is_child_account=*/Tribool::kTrue, "source=TestSource,mode=0,enable_account_consistency=true," - "supervised=true,consistency_enabled_by_default=false"); + "supervised=true,consistency_enabled_by_default=" + + consistency_enabled_by_default_value()); CheckMirrorHeaderRequest( GURL("https://www.google.com"), "0123456789", /*is_child_account=*/Tribool::kFalse, "source=TestSource,mode=0,enable_account_consistency=true," - "supervised=false,consistency_enabled_by_default=false"); + "supervised=false,consistency_enabled_by_default=" + + consistency_enabled_by_default_value()); } // Mirror is always enabled on Android and iOS, so these tests are only relevant @@ -711,7 +732,7 @@ TEST_F(SigninHeaderHelperTest, TestBuildManageAccountsParams) { "action=ADDSESSION,email=%s,is_saml=true," "is_same_tab=true,continue_url=%s", kEmail, kContinueURL); -#if defined(OS_ANDROID) || defined(OS_IOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) header += ",show_consistency_promo=true"; #endif @@ -721,7 +742,7 @@ TEST_F(SigninHeaderHelperTest, TestBuildManageAccountsParams) { EXPECT_EQ(true, params.is_saml); EXPECT_EQ(true, params.is_same_tab); EXPECT_EQ(GURL(kContinueURL), params.continue_url); -#if defined(OS_ANDROID) +#if BUILDFLAG(IS_ANDROID) EXPECT_EQ(true, params.show_consistency_promo); #endif } |