commit cd3fad6bed38209a5c09e78e5f0fc703d583fc7f
author maxbogue <maxbogue@chromium.org> Tue Jun 09 00:44:53 2015
committer Commit bot <commit-bot@chromium.org> Tue Jun 09 00:45:33 2015
tree 13c15ec7561e75e755bbc132dd8bbabecd8a2e81
parent 112f7e29eded1e9333e9e4dd6332bb523b98e900

[Sync] Rename StartSuppressed to !SyncRequested

This is part of an effort to clean up sync's state interface.

Note that SyncRequested is the inverse of the old StartSuppressed, so
every invocation should be inverted.

BUG=495192
TBR=rogerta,sdefresne

Review URL: https://codereview.chromium.org/1151853008

Cr-Commit-Position: refs/heads/master@{#333403}

chrome/browser/sync/profile_sync_service_android.cc

diff --git a/chrome/browser/sync/profile_sync_service_android.cc b/chrome/browser/sync/profile_sync_service_android.cc
index 363fd41..ba06301 100644
--- a/chrome/browser/sync/profile_sync_service_android.cc
+++ b/chrome/browser/sync/profile_sync_service_android.cc
@@ -153,8 +153,8 @@
 void ProfileSyncServiceAndroid::EnableSync(JNIEnv* env, jobject) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // Don't need to do anything if we're already enabled.
-  if (sync_prefs_->IsStartSuppressed())
-    sync_service_->UnsuppressAndStart();
+  if (!sync_service_->IsSyncRequested())
+    sync_service_->RequestStart();
   else
     DVLOG(2) << "Ignoring call to EnableSync() because sync is already enabled";
 }
@@ -162,8 +162,8 @@
 void ProfileSyncServiceAndroid::DisableSync(JNIEnv* env, jobject) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // Don't need to do anything if we're already disabled.
-  if (!sync_prefs_->IsStartSuppressed()) {
-    sync_service_->StopAndSuppress();
+  if (sync_service_->IsSyncRequested()) {
+    sync_service_->RequestStop();
   } else {
     DVLOG(2)
         << "Ignoring call to DisableSync() because sync is already disabled";
@@ -182,9 +182,9 @@
     return;
   }
 
-  // Enable sync (if we don't have credentials yet, this will enable sync but
-  // will not start it up - sync will start once credentials arrive).
-  sync_service_->UnsuppressAndStart();
+  // Request that sync starts. If we don't have credentials yet, this will
+  // let sync start once credentials arrive.
+  sync_service_->RequestStart();
 }
 
 void ProfileSyncServiceAndroid::SignOutSync(JNIEnv* env, jobject) {
@@ -192,8 +192,8 @@
   DCHECK(profile_);
   sync_service_->DisableForUser();
 
-  // Need to clear suppress start flag manually
-  sync_prefs_->SetStartSuppressed(false);
+  // Need to reset sync requested flag manually
+  sync_prefs_->SetSyncRequested(true);
 }
 
 void ProfileSyncServiceAndroid::FlushDirectory(JNIEnv* env, jobject) {
@@ -442,10 +442,10 @@
   return sync_service_->HasSyncSetupCompleted();
 }
 
-jboolean ProfileSyncServiceAndroid::IsStartSuppressed(
+jboolean ProfileSyncServiceAndroid::IsSyncRequested(
     JNIEnv* env, jobject obj) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  return sync_prefs_->IsStartSuppressed();
+  return sync_service_->IsSyncRequested();
 }
 
 void ProfileSyncServiceAndroid::EnableEncryptEverything(