diff options
Diffstat (limited to 'chrome/browser/sync/profile_sync_service.cc')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index 028a5f4..f939999 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -93,8 +93,6 @@ ProfileSyncService::ProfileSyncService(ProfileSyncFactory* factory, channel == platform_util::CHANNEL_BETA) { sync_service_url_ = GURL(kSyncServerUrl); } - - tried_implicit_gaia_remove_when_bug_62103_fixed_ = false; } ProfileSyncService::~ProfileSyncService() { @@ -990,9 +988,7 @@ void ProfileSyncService::GetRegisteredDataTypes( } bool ProfileSyncService::IsUsingSecondaryPassphrase() const { - return backend_.get() && (backend_->IsUsingExplicitPassphrase() || - (tried_implicit_gaia_remove_when_bug_62103_fixed_ && - IsPassphraseRequired())); + return backend_.get() && backend_->IsUsingExplicitPassphrase(); } bool ProfileSyncService::IsCryptographerReady( @@ -1275,7 +1271,6 @@ void ProfileSyncService::Observe(NotificationType type, // update the implicit passphrase (idempotent if the passphrase didn't // actually change), or the user has an explicit passphrase set so this // becomes a no-op. - tried_implicit_gaia_remove_when_bug_62103_fixed_ = true; SetPassphrase(successful->password, false, true); break; } |