| Index: chrome/browser/sync/profile_sync_service.cc
|
| ===================================================================
|
| --- chrome/browser/sync/profile_sync_service.cc (revision 177205)
|
| +++ chrome/browser/sync/profile_sync_service.cc (working copy)
|
| @@ -162,8 +162,6 @@
|
| channel == chrome::VersionInfo::CHANNEL_BETA) {
|
| sync_service_url_ = GURL(kSyncServerUrl);
|
| }
|
| - if (signin_)
|
| - signin_->signin_global_error()->AddProvider(this);
|
| }
|
|
|
| ProfileSyncService::~ProfileSyncService() {
|
| @@ -534,9 +532,6 @@
|
| // use it.
|
| invalidator_registrar_.reset();
|
|
|
| - if (signin_)
|
| - signin_->signin_global_error()->RemoveProvider(this);
|
| -
|
| ShutdownImpl(false);
|
| }
|
|
|
| @@ -595,9 +590,7 @@
|
| encrypt_everything_ = false;
|
| encrypted_types_ = syncer::SyncEncryptionHandler::SensitiveTypes();
|
| passphrase_required_reason_ = syncer::REASON_PASSPHRASE_NOT_REQUIRED;
|
| - // Revert to "no auth error".
|
| - if (last_auth_error_.state() != GoogleServiceAuthError::NONE)
|
| - UpdateAuthErrorState(GoogleServiceAuthError::None());
|
| + last_auth_error_ = AuthError::None();
|
|
|
| if (sync_global_error_.get()) {
|
| GlobalErrorServiceFactory::GetForProfile(profile_)->RemoveGlobalError(
|
| @@ -923,8 +916,6 @@
|
|
|
| // Fan the notification out to interested UI-thread components.
|
| NotifyObservers();
|
| - if (signin())
|
| - signin()->signin_global_error()->AuthStatusChanged();
|
| }
|
|
|
| namespace {
|
| @@ -1225,10 +1216,6 @@
|
| return last_auth_error_;
|
| }
|
|
|
| -GoogleServiceAuthError ProfileSyncService::GetAuthStatus() const {
|
| - return GetAuthError();
|
| -}
|
| -
|
| bool ProfileSyncService::FirstSetupInProgress() const {
|
| return !HasSyncSetupCompleted() && setup_in_progress_;
|
| }
|
|
|