sync: Remove ClearUserData command.

chrome/browser/sync/profile_sync_service.h

Index: chrome/browser/sync/profile_sync_service.h
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
index bb3345b9084be178b63b60066bc342c1446b72b9..eba851cfdd9aeff5663d22c31bc45aa2ab40ba54 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -142,14 +142,6 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
     MAX_SYNC_EVENT_CODE
   };
 
-  // Keep track of where we are when clearing server data.
-  enum ClearServerDataState {
-    CLEAR_NOT_STARTED = 1,
-    CLEAR_CLEARING = 2,
-    CLEAR_FAILED = 3,
-    CLEAR_SUCCEEDED = 4,
-  };
-
   enum StartBehavior {
     AUTO_START,
     MANUAL_START,
@@ -204,10 +196,6 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
   // null.
   browser_sync::SessionModelAssociator* GetSessionModelAssociator();
 
-  // Maintain state of where we are in a server clear operation.
-  void ResetClearServerDataState();
-  ClearServerDataState GetClearServerDataState();
-
   // Fills state_map with a map of current data types that are possible to
   // sync, as well as their states.
   void GetDataTypeControllerStates(
@@ -216,9 +204,6 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
   // Disables sync for user. Use ShowLoginDialog to enable.
   virtual void DisableForUser();
 
-  // Clears all Chromesync data from the server.
-  void ClearServerData();
-
   // Whether sync is enabled by user or not.
   virtual bool HasSyncSetupCompleted() const;
   virtual void SetSyncSetupCompleted();
@@ -232,8 +217,6 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
   virtual void OnConnectionStatusChange(
       sync_api::ConnectionStatus status) OVERRIDE;
   virtual void OnStopSyncingPermanently() OVERRIDE;
-  virtual void OnClearServerDataFailed() OVERRIDE;
-  virtual void OnClearServerDataSucceeded() OVERRIDE;
   virtual void OnPassphraseRequired(
       sync_api::PassphraseRequiredReason reason,
       const sync_pb::EncryptedData& pending_keys) OVERRIDE;
@@ -249,8 +232,6 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
   virtual void OnActionableError(
       const browser_sync::SyncProtocolError& error) OVERRIDE;
 
-  void OnClearServerDataTimeout();
-
   // Update the last auth error and notify observers of error state.
   void UpdateAuthErrorState(const GoogleServiceAuthError& error);
 
@@ -720,16 +701,6 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
   // credentials were provided.
   std::string cached_passphrase_;
 
-  // Keep track of where we are in a server clear operation
-  ClearServerDataState clear_server_data_state_;
-
-  // Timeout for the clear data command.  This timeout is a temporary hack
-  // and is necessary because the nudge sync framework can drop nudges for
-  // a wide variety of sync-related conditions (throttling, connections issues,
-  // syncer paused, etc.).  It can only be removed correctly when the framework
-  // is reworked to allow one-shot commands like clearing server data.
-  base::OneShotTimer<ProfileSyncService> clear_server_data_timer_;
-
   // The current set of encrypted types.  Always a superset of
   // Cryptographer::SensitiveTypes().
   syncable::ModelTypeSet encrypted_types_;