[sync] Hide "Sync nothing" UI; Go back to signing out on dashboard clears and abandoned initial set…

chrome/browser/ui/webui/sync_setup_handler.cc

Index: chrome/browser/ui/webui/sync_setup_handler.cc
diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc
index 15f03ce35bd858e4d3ff7919c72f6def32a1af77..3082baf1479ec2c7e5766184250e26c8f0f8831d 100644
--- a/chrome/browser/ui/webui/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler.cc
@@ -932,6 +932,13 @@ void SyncSetupHandler::CloseSyncSetup() {
       if (sync_service) {
         DVLOG(1) << "Sync setup aborted by user action";
         sync_service->OnStopSyncingPermanently();
+#if !defined(OS_CHROMEOS)
+        // Sign out the user on desktop Chrome if they click cancel during
+        // initial setup.
+        // TODO(rsimha): Revisit this for M30. See http://crbug.com/252049.
+        if (was_signing_in || sync_service->FirstSetupInProgress())

[Andrew T Wilson (Slow), 2013/06/20 21:49:37]

Not sure we should be checking was_signing_in here - what's the case where we
want to sign out the user even though FirstSetupInProgress() == false?

[Raghu Simha, 2013/06/26 21:48:15]

I don't believe there should be any case where FirstSetupInProgress() == false
and was_signing_in is true, and we still want to sign out the user. I included a
check for was_signing_in for 2 reasons:

1) I didn't want to let fall through the cracks, any case where was_signing_in
is true, but for some reason, FirstSetupInProgress() is not yet true. After
taking another look at the code, I noticed that we call SetSetupInProgress(true)
prior to displaying any sync setup UI (or cancel buttons), so we should be good
with the single check.
2) The original implementation (prior to r200867) was checking both conditions.
See line 1150 of the left half of 
https://codereview.chromium.org/14691004/diff/202002/chrome/browser/ui/webui/....

I've removed the check based on the above. Done.

+          SigninManagerFactory::GetForProfile(GetProfile())->SignOut();
+#endif
       }
     }