[iOS] Use signin namespace for utility functions.

As a follow-up to crrev.com/c/2562778, moves all sign-in utilities to
the new signin namespace.

Bug: 1157531
Change-Id: Ic695832a7cd5778e69039b2d3fd1395de3cde50c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2593259Reviewed-by: Eugene But <eugenebut@chromium.org>
Commit-Queue: Nohemi Fernandez <fernandex@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837501}

ios/chrome/browser/ui/authentication/signin/signin_utils.h

@@ -14,20 +14,20 @@ namespace base {
 class Version;
 }
 
+namespace signin {
+
 // Returns true if this user sign-in upgrade should be shown for |browserState|.
-bool SigninShouldPresentUserSigninUpgrade(ChromeBrowserState* browserState);
+bool ShouldPresentUserSigninUpgrade(ChromeBrowserState* browserState);
 
 // Records in user defaults:
 //   + the Chromium current version.
 //   + increases the sign-in promo display count.
 //   + Gaia ids list.
 // Separated out into a discrete function to allow overriding when testing.
-void SigninRecordVersionSeen();
+void RecordVersionSeen();
 
 // Set the Chromium current version for sign-in. Used for tests only.
-void SetSigninCurrentVersionForTesting(base::Version* version);
-
-namespace signin {
+void SetCurrentVersionForTesting(base::Version* version);
 
 // Returns a boolean indicating whether browser sign-in is allowed by policy.
 bool IsSigninAllowed(const PrefService* prefs);

ios/chrome/browser/ui/authentication/signin/signin_utils.mm

@@ -52,7 +52,9 @@ NSSet* GaiaIdSetWithIdentities(NSArray* identities) {
 
 #pragma mark - Public
 
-bool SigninShouldPresentUserSigninUpgrade(ChromeBrowserState* browserState) {
+namespace signin {
+
+bool ShouldPresentUserSigninUpgrade(ChromeBrowserState* browserState) {
   if (tests_hook::DisableSigninRecallPromo())
     return false;
 
@@ -110,7 +112,7 @@ bool SigninShouldPresentUserSigninUpgrade(ChromeBrowserState* browserState) {
          ![lastKnownGaiaIdSet isEqualToSet:currentGaiaIdSet];
 }
 
-void SigninRecordVersionSeen() {
+void RecordVersionSeen() {
   NSUserDefaults* standardDefaults = [NSUserDefaults standardUserDefaults];
   [standardDefaults
       setObject:base::SysUTF8ToNSString(CurrentVersion().GetString())
@@ -128,14 +130,10 @@ void SigninRecordVersionSeen() {
                         forKey:kSigninPromoViewDisplayCountKey];
 }
 
-void SetSigninCurrentVersionForTesting(Version* version) {
+void SetCurrentVersionForTesting(Version* version) {
   g_current_version_for_test = version;
 }
 
-// TODO(crbug.com/1157531): Move the other functions inside the signin namespace
-// as well.
-namespace signin {
-
 bool IsSigninAllowed(const PrefService* prefs) {
   // Sign-in is always allowed if the policy handler isn't installed.
   return !ShouldInstallBrowserSigninPolicyHandler() ||

ios/chrome/browser/ui/authentication/signin/signin_utils_unittest.mm

@@ -43,10 +43,10 @@ namespace {
 class SigninUtilsTest : public BlockCleanupTest {
  public:
   SigninUtilsTest() : version_("1.0") {
-    SetSigninCurrentVersionForTesting(&version_);
+    signin::SetCurrentVersionForTesting(&version_);
   }
 
-  ~SigninUtilsTest() override { SetSigninCurrentVersionForTesting(nullptr); }
+  ~SigninUtilsTest() override { signin::SetCurrentVersionForTesting(nullptr); }
 
   void SetUp() override {
     BlockCleanupTest::SetUp();
@@ -92,54 +92,54 @@ class SigninUtilsTest : public BlockCleanupTest {
 // Should show the sign-in upgrade for the first time.
 TEST_F(SigninUtilsTest, TestWillDisplay) {
   EXPECT_TRUE(
-      SigninShouldPresentUserSigninUpgrade(chrome_browser_state_.get()));
+      signin::ShouldPresentUserSigninUpgrade(chrome_browser_state_.get()));
 }
 
 // Should not show the sign-in upgrade twice on the same version.
 TEST_F(SigninUtilsTest, TestWillNotDisplaySameVersion) {
-  SigninRecordVersionSeen();
+  signin::RecordVersionSeen();
   EXPECT_FALSE(
-      SigninShouldPresentUserSigninUpgrade(chrome_browser_state_.get()));
+      signin::ShouldPresentUserSigninUpgrade(chrome_browser_state_.get()));
 }
 
 // Should not show the sign-in upgrade twice until two major version after.
 TEST_F(SigninUtilsTest, TestWillNotDisplayOneMinorVersion) {
-  SigninRecordVersionSeen();
+  signin::RecordVersionSeen();
   // Set the future version to be one minor release ahead.
   Version version_1_1("1.1");
-  SetSigninCurrentVersionForTesting(&version_1_1);
+  signin::SetCurrentVersionForTesting(&version_1_1);
   EXPECT_FALSE(
-      SigninShouldPresentUserSigninUpgrade(chrome_browser_state_.get()));
+      signin::ShouldPresentUserSigninUpgrade(chrome_browser_state_.get()));
 }
 
 // Should not show the sign-in upgrade twice until two major version after.
 TEST_F(SigninUtilsTest, TestWillNotDisplayTwoMinorVersions) {
-  SigninRecordVersionSeen();
+  signin::RecordVersionSeen();
   // Set the future version to be two minor releases ahead.
   Version version_1_2("1.2");
-  SetSigninCurrentVersionForTesting(&version_1_2);
+  signin::SetCurrentVersionForTesting(&version_1_2);
   EXPECT_FALSE(
-      SigninShouldPresentUserSigninUpgrade(chrome_browser_state_.get()));
+      signin::ShouldPresentUserSigninUpgrade(chrome_browser_state_.get()));
 }
 
 // Should not show the sign-in upgrade twice until two major version after.
 TEST_F(SigninUtilsTest, TestWillNotDisplayOneMajorVersion) {
-  SigninRecordVersionSeen();
+  signin::RecordVersionSeen();
   // Set the future version to be one major release ahead.
   Version version_2_0("2.0");
-  SetSigninCurrentVersionForTesting(&version_2_0);
+  signin::SetCurrentVersionForTesting(&version_2_0);
   EXPECT_FALSE(
-      SigninShouldPresentUserSigninUpgrade(chrome_browser_state_.get()));
+      signin::ShouldPresentUserSigninUpgrade(chrome_browser_state_.get()));
 }
 
 // Should show the sign-in upgrade a second time, 2 version after.
 TEST_F(SigninUtilsTest, TestWillDisplayTwoMajorVersions) {
-  SigninRecordVersionSeen();
+  signin::RecordVersionSeen();
   // Set the future version to be two major releases ahead.
   Version version_3_0("3.0");
-  SetSigninCurrentVersionForTesting(&version_3_0);
+  signin::SetCurrentVersionForTesting(&version_3_0);
   EXPECT_TRUE(
-      SigninShouldPresentUserSigninUpgrade(chrome_browser_state_.get()));
+      signin::ShouldPresentUserSigninUpgrade(chrome_browser_state_.get()));
 }
 
 // Show the sign-in upgrade on version 1.0.
@@ -147,14 +147,14 @@ TEST_F(SigninUtilsTest, TestWillDisplayTwoMajorVersions) {
 // Move to version 5.0.
 // Expected: should not show the sign-in upgrade.
 TEST_F(SigninUtilsTest, TestWillShowTwoTimesOnly) {
-  SigninRecordVersionSeen();
+  signin::RecordVersionSeen();
   Version version_3_0("3.0");
-  SetSigninCurrentVersionForTesting(&version_3_0);
-  SigninRecordVersionSeen();
+  signin::SetCurrentVersionForTesting(&version_3_0);
+  signin::RecordVersionSeen();
   Version version_5_0("5.0");
-  SetSigninCurrentVersionForTesting(&version_5_0);
+  signin::SetCurrentVersionForTesting(&version_5_0);
   EXPECT_FALSE(
-      SigninShouldPresentUserSigninUpgrade(chrome_browser_state_.get()));
+      signin::ShouldPresentUserSigninUpgrade(chrome_browser_state_.get()));
 }
 
 // Show the sign-in upgrade on version 1.0.
@@ -163,16 +163,16 @@ TEST_F(SigninUtilsTest, TestWillShowTwoTimesOnly) {
 // Add new account.
 // Expected: should show the sign-in upgrade.
 TEST_F(SigninUtilsTest, TestWillShowForNewAccountAdded) {
-  SigninRecordVersionSeen();
+  signin::RecordVersionSeen();
   Version version_3_0("3.0");
-  SetSigninCurrentVersionForTesting(&version_3_0);
-  SigninRecordVersionSeen();
+  signin::SetCurrentVersionForTesting(&version_3_0);
+  signin::RecordVersionSeen();
   Version version_5_0("5.0");
-  SetSigninCurrentVersionForTesting(&version_5_0);
+  signin::SetCurrentVersionForTesting(&version_5_0);
   ios::FakeChromeIdentityService::GetInstanceFromChromeProvider()
       ->AddIdentities(@[ @"foo1" ]);
   EXPECT_TRUE(
-      SigninShouldPresentUserSigninUpgrade(chrome_browser_state_.get()));
+      signin::ShouldPresentUserSigninUpgrade(chrome_browser_state_.get()));
 }
 
 // Add new account.
@@ -185,12 +185,12 @@ TEST_F(SigninUtilsTest, TestWillNotShowWithAccountRemoved) {
   NSString* newAccountGaiaId = @"foo1";
   ios::FakeChromeIdentityService::GetInstanceFromChromeProvider()
       ->AddIdentities(@[ newAccountGaiaId ]);
-  SigninRecordVersionSeen();
+  signin::RecordVersionSeen();
   Version version_3_0("3.0");
-  SetSigninCurrentVersionForTesting(&version_3_0);
-  SigninRecordVersionSeen();
+  signin::SetCurrentVersionForTesting(&version_3_0);
+  signin::RecordVersionSeen();
   Version version_5_0("5.0");
-  SetSigninCurrentVersionForTesting(&version_5_0);
+  signin::SetCurrentVersionForTesting(&version_5_0);
   NSArray* allIdentities =
       ios::FakeChromeIdentityService::GetInstanceFromChromeProvider()
           ->GetAllIdentities();
@@ -205,7 +205,7 @@ TEST_F(SigninUtilsTest, TestWillNotShowWithAccountRemoved) {
   ios::FakeChromeIdentityService::GetInstanceFromChromeProvider()
       ->ForgetIdentity(foo1Identity, nil);
   EXPECT_FALSE(
-      SigninShouldPresentUserSigninUpgrade(chrome_browser_state_.get()));
+      signin::ShouldPresentUserSigninUpgrade(chrome_browser_state_.get()));
 }
 
 // Show the sign-in upgrade on version 1.0.
@@ -214,16 +214,16 @@ TEST_F(SigninUtilsTest, TestWillNotShowWithAccountRemoved) {
 // Add an account.
 // Expected: should not show the sign-in upgrade.
 TEST_F(SigninUtilsTest, TestWillNotShowNewAccountUntilTwoVersion) {
-  SigninRecordVersionSeen();
+  signin::RecordVersionSeen();
   Version version_3_0("3.0");
-  SetSigninCurrentVersionForTesting(&version_3_0);
-  SigninRecordVersionSeen();
+  signin::SetCurrentVersionForTesting(&version_3_0);
+  signin::RecordVersionSeen();
   ios::FakeChromeIdentityService::GetInstanceFromChromeProvider()
       ->AddIdentities(@[ @"foo1" ]);
   Version version_4_0("4.0");
-  SetSigninCurrentVersionForTesting(&version_4_0);
+  signin::SetCurrentVersionForTesting(&version_4_0);
   EXPECT_FALSE(
-      SigninShouldPresentUserSigninUpgrade(chrome_browser_state_.get()));
+      signin::ShouldPresentUserSigninUpgrade(chrome_browser_state_.get()));
 }
 
 // Show the sign-in upgrade on version 1.0.
@@ -232,13 +232,13 @@ TEST_F(SigninUtilsTest, TestWillNotShowNewAccountUntilTwoVersion) {
 // Expected: should not show the sign-in upgrade (only display every 2
 // versions).
 TEST_F(SigninUtilsTest, TestWillNotShowNewAccountUntilTwoVersionBis) {
-  SigninRecordVersionSeen();
+  signin::RecordVersionSeen();
   Version version_2_0("2.0");
-  SetSigninCurrentVersionForTesting(&version_2_0);
+  signin::SetCurrentVersionForTesting(&version_2_0);
   ios::FakeChromeIdentityService::GetInstanceFromChromeProvider()
       ->AddIdentities(@[ @"foo1" ]);
   EXPECT_FALSE(
-      SigninShouldPresentUserSigninUpgrade(chrome_browser_state_.get()));
+      signin::ShouldPresentUserSigninUpgrade(chrome_browser_state_.get()));
 }
 
 // Should not show the sign-in upgrade if sign-in is disabled by policy.
@@ -252,7 +252,7 @@ TEST_F(SigninUtilsTest, TestWillNotShowIfDisabledByPolicy) {
   chrome_browser_state_->GetPrefs()->SetBoolean(prefs::kSigninAllowed, false);
 
   EXPECT_FALSE(
-      SigninShouldPresentUserSigninUpgrade(chrome_browser_state_.get()));
+      signin::ShouldPresentUserSigninUpgrade(chrome_browser_state_.get()));
 }
 
 // signin::IsSigninAllowed should respect the kSigninAllowed pref.

ios/chrome/browser/ui/authentication/signin/user_signin/logging/first_run_signin_logger.mm

@@ -33,7 +33,7 @@ using signin_metrics::RecordSigninUserActionForAccessPoint;
     LogSigninAccessPointStarted(self.accessPoint, self.promoAction);
     RecordSigninUserActionForAccessPoint(self.accessPoint, self.promoAction);
   }
-  SigninRecordVersionSeen();
+  signin::RecordVersionSeen();
 }
 
 @end

ios/chrome/browser/ui/authentication/signin/user_signin/logging/upgrade_signin_logger.mm

@@ -53,7 +53,7 @@ typedef NS_ENUM(NSUInteger, UserSigninPromoAction) {
 
   // Records in user defaults that the promo has been shown as well as the
   // number of times it's been displayed.
-  SigninRecordVersionSeen();
+  signin::RecordVersionSeen();
   NSUserDefaults* standardDefaults = [NSUserDefaults standardUserDefaults];
   int promoSeenCount =
       [standardDefaults integerForKey:kDisplayedSSORecallPromoCountKey];

ios/chrome/browser/ui/main/scene_controller.mm

@@ -958,7 +958,7 @@ const char kMultiWindowOpenInNewWindowHistogram[] =
 // Presents the sign-in upgrade promo if is relevant and possible.
 // Returns YES if the promo is shown.
 - (BOOL)presentSigninUpgradePromoIfPossible {
-  if (!SigninShouldPresentUserSigninUpgrade(
+  if (!signin::ShouldPresentUserSigninUpgrade(
           self.sceneState.appState.mainBrowserState))
     return NO;
   // Don't show promos if first run is shown in any scene.  (Note:  This flag