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

A new "Sync nothing" option was recently added to the advanced sync
settings dialog. It allowed the user to stop syncing, but stay signed
in. In addition, sign in and sync were separated, with the result that
on a dashboard clear, the user would remain signed in, but would no
longer have sync enabled.

For M29, we've decided to hide this UI and revert to old sign-in/out
behavior because there are other services that depend on the sync
engine being up and running.

This patch undoes a small number of these changes as listed below:

1) Hides the "Sync nothing" item in the advanced sync settings drop-down
2) Signs out the user if the user clicks "Choose what to sync" during
   initial setup, and then clicks cancel on the advanced dialog
3) Signs out the user when a dashboard clear is done
4) Signs out the user if the user clicks cancel while re-setting up sync
   after the dashboard clear
5) Reverts the status string shown when sync is cleared via the dashboard

BUG=235633, 252049, 248877
TEST=No "Sync nothing" UI in advanced settings; user is signed out when sync is disabled on Desktop; Chrome OS strings back to M28

Review URL: https://chromiumcodereview.appspot.com/17392009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209267 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 6 deletions

diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc
index 46aebd5..645bc4c 100644
--- a/chrome/browser/sync/sync_ui_util.cc
+++ b/chrome/browser/sync/sync_ui_util.cc
@@ -56,10 +56,8 @@ string16 GetSyncedStateStatusLabel(ProfileSyncService* service,
                                         user_name);
     } else if (service->IsStartSuppressed()) {
       // User is signed in, but sync has been stopped.
-      return l10n_util::GetStringFUTF16(
-          IDS_SIGNED_IN_WITH_SYNC_SUPPRESSED,
-          user_name,
-          ASCIIToUTF16(chrome::kSyncGoogleDashboardURL));
+      return l10n_util::GetStringFUTF16(IDS_SIGNED_IN_WITH_SYNC_SUPPRESSED,
+                                        user_name);
     }
   }
 
@@ -253,8 +251,7 @@ MessageType GetStatusInfo(ProfileSyncService* service,
       if (status_label) {
         string16 label = l10n_util::GetStringFUTF16(
                              IDS_SIGNED_IN_WITH_SYNC_SUPPRESSED,
-                             UTF8ToUTF16(signin.GetAuthenticatedUsername()),
-                             ASCIIToUTF16(chrome::kSyncGoogleDashboardURL));
+                             UTF8ToUTF16(signin.GetAuthenticatedUsername()));
         status_label->assign(label);
         result_type = PRE_SYNCED;
       }