| Index: chrome/browser/sync/glue/sync_backend_host.cc
|
| diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc
|
| index c4c6e312cbedf09385a946f451a60a605e6c137d..44793c5b5f259fcdebdf20b4c73e2807a9af6266 100644
|
| --- a/chrome/browser/sync/glue/sync_backend_host.cc
|
| +++ b/chrome/browser/sync/glue/sync_backend_host.cc
|
| @@ -97,8 +97,6 @@ class SyncBackendHost::Core
|
| const std::string& bootstrap_token) OVERRIDE;
|
| virtual void OnStopSyncingPermanently() OVERRIDE;
|
| virtual void OnUpdatedToken(const std::string& token) OVERRIDE;
|
| - virtual void OnClearServerDataFailed() OVERRIDE;
|
| - virtual void OnClearServerDataSucceeded() OVERRIDE;
|
| virtual void OnEncryptedTypesChanged(
|
| syncable::ModelTypeSet encrypted_types,
|
| bool encrypt_everything) OVERRIDE;
|
| @@ -128,9 +126,6 @@ class SyncBackendHost::Core
|
| // initialization and authentication).
|
| void DoStartSyncing(const ModelSafeRoutingInfo& routing_info);
|
|
|
| - // Called to clear server data.
|
| - void DoRequestClearServerData();
|
| -
|
| // Called to cleanup disabled types.
|
| void DoRequestCleanupDisabledTypes(
|
| const browser_sync::ModelSafeRoutingInfo& routing_info);
|
| @@ -628,13 +623,6 @@ void SyncBackendHost::DeactivateDataType(syncable::ModelType type) {
|
| registrar_->DeactivateDataType(type);
|
| }
|
|
|
| -bool SyncBackendHost::RequestClearServerData() {
|
| - sync_thread_.message_loop()->PostTask(FROM_HERE,
|
| - base::Bind(&SyncBackendHost::Core::DoRequestClearServerData,
|
| - core_.get()));
|
| - return true;
|
| -}
|
| -
|
| sync_api::UserShare* SyncBackendHost::GetUserShare() const {
|
| DCHECK(initialized());
|
| return core_->sync_manager()->GetUserShare();
|
| @@ -988,24 +976,6 @@ void SyncBackendHost::Core::OnUpdatedToken(const std::string& token) {
|
| &SyncBackendHost::NotifyUpdatedToken, token);
|
| }
|
|
|
| -void SyncBackendHost::Core::OnClearServerDataFailed() {
|
| - if (!sync_loop_)
|
| - return;
|
| - DCHECK_EQ(MessageLoop::current(), sync_loop_);
|
| - host_.Call(
|
| - FROM_HERE,
|
| - &SyncBackendHost::HandleClearServerDataFailedOnFrontendLoop);
|
| -}
|
| -
|
| -void SyncBackendHost::Core::OnClearServerDataSucceeded() {
|
| - if (!sync_loop_)
|
| - return;
|
| - DCHECK_EQ(MessageLoop::current(), sync_loop_);
|
| - host_.Call(
|
| - FROM_HERE,
|
| - &SyncBackendHost::HandleClearServerDataSucceededOnFrontendLoop);
|
| -}
|
| -
|
| void SyncBackendHost::Core::OnEncryptedTypesChanged(
|
| syncable::ModelTypeSet encrypted_types,
|
| bool encrypt_everything) {
|
| @@ -1148,11 +1118,6 @@ void SyncBackendHost::Core::DoStartSyncing(
|
| sync_manager_->StartSyncingNormally(routing_info);
|
| }
|
|
|
| -void SyncBackendHost::Core::DoRequestClearServerData() {
|
| - DCHECK_EQ(MessageLoop::current(), sync_loop_);
|
| - sync_manager_->RequestClearServerData();
|
| -}
|
| -
|
| void SyncBackendHost::Core::DoRequestCleanupDisabledTypes(
|
| const browser_sync::ModelSafeRoutingInfo& routing_info) {
|
| DCHECK_EQ(MessageLoop::current(), sync_loop_);
|
| @@ -1421,18 +1386,6 @@ void SyncBackendHost::HandleStopSyncingPermanentlyOnFrontendLoop() {
|
| frontend_->OnStopSyncingPermanently();
|
| }
|
|
|
| -void SyncBackendHost::HandleClearServerDataSucceededOnFrontendLoop() {
|
| - if (!frontend_)
|
| - return;
|
| - frontend_->OnClearServerDataSucceeded();
|
| -}
|
| -
|
| -void SyncBackendHost::HandleClearServerDataFailedOnFrontendLoop() {
|
| - if (!frontend_)
|
| - return;
|
| - frontend_->OnClearServerDataFailed();
|
| -}
|
| -
|
| void SyncBackendHost::HandleConnectionStatusChangeOnFrontendLoop(
|
| sync_api::ConnectionStatus status) {
|
| if (!frontend_)
|
|
|