Rename LoginUIService::ABORT_SIGNIN to LoginUIService::ABORT_SYNC

When the user clicks on "Cancel" on the sync confirmation dialog, only
the sync consent is revoked (the primary acount is *not* cleared), so
it naming the corresponding enum entry ABORT_SYNC instead of ABORT_SIGNIN
is more accurate.

Bug: 1155505
Change-Id: Ibc032c1c7f7e9b5493cdb1f8b4f996152f9d7f8b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2578842
Commit-Queue: Mihai Sardarescu <msarda@chromium.org>
Reviewed-by: David Roger <droger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835205}

chrome/browser/chromeos/sync/turn_sync_on_helper.cc

@@ -213,7 +213,7 @@ void TurnSyncOnHelper::FinishSyncSetup(
           account_id);
       break;
     }
-    case LoginUIService::ABORT_SIGNIN:
+    case LoginUIService::ABORT_SYNC:
       // Chrome OS users stay signed in even if sync setup is cancelled.
       break;
   }

chrome/browser/chromeos/sync/turn_sync_on_helper_unittest.cc

@@ -149,7 +149,7 @@ TEST_F(TurnSyncOnHelperTest, UserClicksCancel) {
   BrowserList::SetLastActive(browser());
 
   // Simulate the user clicking "Cancel".
-  helper.OnSyncConfirmationUIClosed(LoginUIService::ABORT_SIGNIN);
+  helper.OnSyncConfirmationUIClosed(LoginUIService::ABORT_SYNC);
 
   // Setup is not complete and we didn't show settings.
   EXPECT_FALSE(identity_manager()->HasPrimaryAccount(ConsentLevel::kSync));

chrome/browser/policy/cloud/user_policy_signin_service_browsertest.cc

@@ -396,8 +396,8 @@ IN_PROC_BROWSER_TEST_F(UserPolicySigninServiceTest, UndoSignin) {
   WaitForPrefValue(profile()->GetPrefs(), prefs::kShowHomeButton,
                    base::Value(true));
 
-  // Undo the signin.
-  ConfirmSync(LoginUIService::ABORT_SIGNIN);
+  // Cancel sync.
+  ConfirmSync(LoginUIService::ABORT_SYNC);
   // Policy is reverted.
   WaitForPrefValue(profile()->GetPrefs(), prefs::kShowHomeButton,
                    base::Value(false));

chrome/browser/ui/webui/signin/dice_turn_sync_on_helper.cc

@@ -578,7 +578,7 @@ void DiceTurnSyncOnHelper::FinishSyncSetupAndDelete(
         consent_service->SetUrlKeyedAnonymizedDataCollectionEnabled(true);
       break;
     }
-    case LoginUIService::ABORT_SIGNIN:
+    case LoginUIService::ABORT_SYNC:
       auto* primary_account_mutator =
           identity_manager_->GetPrimaryAccountMutator();
       DCHECK(primary_account_mutator);

chrome/browser/ui/webui/signin/dice_turn_sync_on_helper_unittest.cc

@@ -460,7 +460,7 @@ class DiceTurnSyncOnHelperTest : public testing::Test {
   DiceTurnSyncOnHelper::SigninChoice enterprise_choice_ =
       DiceTurnSyncOnHelper::SIGNIN_CHOICE_CANCEL;
   LoginUIService::SyncConfirmationUIClosedResult sync_confirmation_result_ =
-      LoginUIService::SyncConfirmationUIClosedResult::ABORT_SIGNIN;
+      LoginUIService::SyncConfirmationUIClosedResult::ABORT_SYNC;
   bool run_delegate_callbacks_ = true;
 
   // Expected delegate calls.

chrome/browser/ui/webui/signin/login_ui_service.h

@@ -42,8 +42,8 @@ class LoginUIService : public KeyedService {
     SYNC_WITH_DEFAULT_SETTINGS,
     // Show the user the sync settings before starting sync.
     CONFIGURE_SYNC_FIRST,
-    // The signing process was aborted, don't start sync or show settings.
-    ABORT_SIGNIN,
+    // Turn sync on process was aborted, don't start sync or show settings.
+    ABORT_SYNC,
   };
 
   // Interface for obervers of LoginUIService.

chrome/browser/ui/webui/signin/sync_confirmation_handler.cc

@@ -101,7 +101,7 @@ void SyncConfirmationHandler::HandleGoToSettings(const base::ListValue* args) {
 
 void SyncConfirmationHandler::HandleUndo(const base::ListValue* args) {
   did_user_explicitly_interact_ = true;
-  CloseModalSigninWindow(LoginUIService::ABORT_SIGNIN);
+  CloseModalSigninWindow(LoginUIService::ABORT_SYNC);
 }
 
 void SyncConfirmationHandler::HandleAccountImageRequest(
@@ -205,7 +205,7 @@ void SyncConfirmationHandler::CloseModalSigninWindow(
       base::RecordAction(
           base::UserMetricsAction("Signin_Signin_WithDefaultSyncSettings"));
       break;
-    case LoginUIService::ABORT_SIGNIN:
+    case LoginUIService::ABORT_SYNC:
       base::RecordAction(base::UserMetricsAction("Signin_Undo_Signin"));
       break;
   }

chrome/browser/ui/webui/signin/sync_confirmation_handler_unittest.cc

@@ -74,7 +74,7 @@ class SyncConfirmationHandlerTest : public BrowserWithTestWindowTest,
   SyncConfirmationHandlerTest()
       : did_user_explicitly_interact_(false),
         on_sync_confirmation_ui_closed_called_(false),
-        sync_confirmation_ui_closed_result_(LoginUIService::ABORT_SIGNIN),
+        sync_confirmation_ui_closed_result_(LoginUIService::ABORT_SYNC),
         web_ui_(new content::TestWebUI),
         login_ui_service_observer_(this) {}
 
@@ -280,7 +280,7 @@ TEST_F(SyncConfirmationHandlerTest, TestHandleUndo) {
   did_user_explicitly_interact_ = true;
 
   EXPECT_TRUE(on_sync_confirmation_ui_closed_called_);
-  EXPECT_EQ(LoginUIService::ABORT_SIGNIN, sync_confirmation_ui_closed_result_);
+  EXPECT_EQ(LoginUIService::ABORT_SYNC, sync_confirmation_ui_closed_result_);
   EXPECT_EQ(1, user_action_tester()->GetActionCount("Signin_Undo_Signin"));
   EXPECT_EQ(0, user_action_tester()->GetActionCount(
       "Signin_Signin_WithDefaultSyncSettings"));