Remove prefs::kSyncSpareBootstrapToken which is never set

The pref was read by ProfileSyncService, but never actually set.

Bug: 938869
Change-Id: Ie924712e82f97c4c2459329e4830aa50e3cfc57d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1556795
Auto-Submit: Marc Treib <treib@chromium.org>
Reviewed-by: Mohamed Amir Yosef <mamir@chromium.org>
Commit-Queue: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#648617}

chrome/browser/prefs/browser_prefs.cc

@@ -1016,4 +1016,9 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
   profile_prefs->ClearPref(kDismissedAssetDownloadSuggestions);
   profile_prefs->ClearPref(kDismissedOfflinePageDownloadSuggestions);
 #endif  // defined(OS_ANDROID)
+
+#if defined(OS_CHROMEOS)
+  // Added 4/2019.
+  syncer::ClearObsoleteSyncSpareBootstrapToken(profile_prefs);
+#endif  // defined(OS_CHROMEOS)
 }

components/sync/base/pref_names.cc

@@ -88,12 +88,6 @@ const char kSyncEncryptionBootstrapToken[] = "sync.encryption_bootstrap_token";
 const char kSyncKeystoreEncryptionBootstrapToken[] =
     "sync.keystore_encryption_bootstrap_token";
 
-#if defined(OS_CHROMEOS)
-// A string that is used to store first-time sync startup after once sync is
-// disabled. This will be refreshed every sign-in.
-const char kSyncSpareBootstrapToken[] = "sync.spare_bootstrap_token";
-#endif  // defined(OS_CHROMEOS)
-
 const char kSyncCacheGuid[] = "sync.cache_guid";
 const char kSyncBirthday[] = "sync.birthday";
 const char kSyncBagOfChips[] = "sync.bag_of_chips";

components/sync/base/pref_names.h

@@ -67,10 +67,6 @@ extern const char kSyncCacheGuid[];
 extern const char kSyncBirthday[];
 extern const char kSyncBagOfChips[];
 
-#if defined(OS_CHROMEOS)
-extern const char kSyncSpareBootstrapToken[];
-#endif  // defined(OS_CHROMEOS)
-
 extern const char kSyncPassphrasePrompted[];
 
 extern const char kSyncMemoryPressureWarningCount[];

components/sync/base/sync_prefs.cc

@@ -36,6 +36,11 @@ const char kSyncFirstSyncTime[] = "sync.first_sync_time";
 // Obsolete pref that used to store long poll intervals received by the server.
 const char kSyncLongPollIntervalSeconds[] = "sync.long_poll_interval";
 
+#if defined(OS_CHROMEOS)
+// Obsolete pref.
+const char kSyncSpareBootstrapToken[] = "sync.spare_bootstrap_token";
+#endif  // defined(OS_CHROMEOS)
+
 // Groups of prefs that always have the same value as a "master" pref.
 // For example, the APPS group has {APP_LIST, APP_SETTINGS}
 // (as well as APPS, but that is implied), so
@@ -166,10 +171,6 @@ void SyncPrefs::RegisterProfilePrefs(
                                std::string());
   registry->RegisterStringPref(prefs::kSyncKeystoreEncryptionBootstrapToken,
                                std::string());
-#if defined(OS_CHROMEOS)
-  // TODO(crbug.com/938869): Remove this pref.
-  registry->RegisterStringPref(prefs::kSyncSpareBootstrapToken, "");
-#endif
   registry->RegisterBooleanPref(prefs::kSyncPassphrasePrompted, false);
   registry->RegisterIntegerPref(prefs::kSyncMemoryPressureWarningCount, -1);
   registry->RegisterBooleanPref(prefs::kSyncShutdownCleanly, false);
@@ -187,6 +188,9 @@ void SyncPrefs::RegisterProfilePrefs(
   registry->RegisterBooleanPref(kSyncHasAuthError, false);
   registry->RegisterInt64Pref(kSyncFirstSyncTime, 0);
   registry->RegisterInt64Pref(kSyncLongPollIntervalSeconds, 0);
+#if defined(OS_CHROMEOS)
+  registry->RegisterStringPref(kSyncSpareBootstrapToken, "");
+#endif
 }
 
 void SyncPrefs::AddSyncPrefObserver(SyncPrefObserver* sync_pref_observer) {
@@ -436,18 +440,6 @@ const char* SyncPrefs::GetPrefNameForDataType(ModelType type) {
   return nullptr;
 }
 
-#if defined(OS_CHROMEOS)
-std::string SyncPrefs::GetSpareBootstrapToken() const {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  return pref_service_->GetString(prefs::kSyncSpareBootstrapToken);
-}
-
-void SyncPrefs::SetSpareBootstrapToken(const std::string& token) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  pref_service_->SetString(prefs::kSyncSpareBootstrapToken, token);
-}
-#endif
-
 void SyncPrefs::OnSyncManagedPrefChanged() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   for (SyncPrefObserver& observer : sync_pref_observers_)
@@ -643,4 +635,10 @@ void ClearObsoleteSyncLongPollIntervalSeconds(PrefService* pref_service) {
   pref_service->ClearPref(kSyncLongPollIntervalSeconds);
 }
 
+#if defined(OS_CHROMEOS)
+void ClearObsoleteSyncSpareBootstrapToken(PrefService* pref_service) {
+  pref_service->ClearPref(kSyncSpareBootstrapToken);
+}
+#endif  // defined(OS_CHROMEOS)
+
 }  // namespace syncer

components/sync/base/sync_prefs.h

@@ -142,13 +142,6 @@ class SyncPrefs : public CryptoSyncPrefs,
   // Maps |type| to its corresponding preference name.
   static const char* GetPrefNameForDataType(ModelType type);
 
-#if defined(OS_CHROMEOS)
-  // Use this spare bootstrap token only when setting up sync for the first
-  // time.
-  std::string GetSpareBootstrapToken() const;
-  void SetSpareBootstrapToken(const std::string& token);
-#endif
-
   // Copy of various fields historically owned and persisted by the Directory.
   // This is a future-proof approach to ultimately replace the Directory once
   // most users have populated prefs and the Directory is about to be removed.
@@ -238,6 +231,9 @@ void ClearObsoleteClearServerDataPrefs(PrefService* pref_service);
 void ClearObsoleteAuthErrorPrefs(PrefService* pref_service);
 void ClearObsoleteFirstSyncTime(PrefService* pref_service);
 void ClearObsoleteSyncLongPollIntervalSeconds(PrefService* pref_service);
+#if defined(OS_CHROMEOS)
+void ClearObsoleteSyncSpareBootstrapToken(PrefService* pref_service);
+#endif  // defined(OS_CHROMEOS)
 
 }  // namespace syncer
 

components/sync/driver/profile_sync_service.cc

@@ -208,14 +208,6 @@ ProfileSyncService::ProfileSyncService(InitParams init_params)
   if (identity_manager_)
     identity_manager_->AddObserver(this);
 
-#if defined(OS_CHROMEOS)
-  std::string bootstrap_token = sync_prefs_.GetEncryptionBootstrapToken();
-  if (bootstrap_token.empty()) {
-    sync_prefs_.SetEncryptionBootstrapToken(
-        sync_prefs_.GetSpareBootstrapToken());
-  }
-#endif
-
   memory_pressure_listener_ = std::make_unique<base::MemoryPressureListener>(
       base::BindRepeating(&ProfileSyncService::OnMemoryPressure,
                           sync_enabled_weak_factory_.GetWeakPtr()));