[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 5d353d93bcabaa2977d5550aefdb3cc7440e1a28..11085eaa3d544059e5a973431b96b261d3e725d8 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 (sync_service->FirstSetupInProgress())
+          SigninManagerFactory::GetForProfile(GetProfile())->SignOut();
+#endif
       }
     }