Remove some dead code about "acknowledged types"

Sync no longer has a concept of "acknowledged types".

BUG=352818
R=stanisc@chromium.org, maniscalco@chromium.org

Review URL: https://codereview.chromium.org/919383002

Cr-Commit-Position: refs/heads/master@{#317989}

7 files changed, 0 insertions, 78 deletions

diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 36fa5d3..515672e 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -1814,7 +1814,6 @@ void ProfileSyncService::OnUserChoseDatatypes(
   if (directory_data_type_manager_.get())
     directory_data_type_manager_->ResetDataTypeErrors();
   ChangePreferredDataTypes(chosen_types);
-  AcknowledgeSyncedTypes();
 }
 
 void ProfileSyncService::ChangePreferredDataTypes(
@@ -2504,10 +2503,6 @@ void ProfileSyncService::UnsuppressAndStart() {
   startup_controller_->TryStart();
 }
 
-void ProfileSyncService::AcknowledgeSyncedTypes() {
-  sync_prefs_.AcknowledgeSyncedTypes(GetRegisteredDataTypes());
-}
-
 void ProfileSyncService::ReconfigureDatatypeManager() {
   // If we haven't initialized yet, don't configure the DTM as it could cause
   // association to start before a Directory has even been created.
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
index f40ac51..aa1f460 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -702,10 +702,6 @@ class ProfileSyncService : public ProfileSyncServiceBase,
   // Resets the flag for suppressing sync startup and starts the sync backend.
   virtual void UnsuppressAndStart();
 
-  // Marks all currently registered types as "acknowledged" so we won't prompt
-  // the user about them any more.
-  void AcknowledgeSyncedTypes();
-
   SyncErrorController* sync_error_controller() {
     return sync_error_controller_.get();
   }
diff --git a/components/sync_driver/pref_names.cc b/components/sync_driver/pref_names.cc
index d4f04d37..6ce6585 100644
--- a/components/sync_driver/pref_names.cc
+++ b/components/sync_driver/pref_names.cc
@@ -86,10 +86,6 @@ const char kSyncKeystoreEncryptionBootstrapToken[] =
 // passphrase.
 const char kSyncUsingSecondaryPassphrase[] = "sync.using_secondary_passphrase";
 
-// List of the currently acknowledged set of sync types, used to figure out
-// if a new sync type has rolled out so we can notify the user.
-const char kSyncAcknowledgedSyncTypes[] = "sync.acknowledged_types";
-
 // The GUID session sync will use to identify this client, even across sync
 // disable/enable events.
 const char kSyncSessionsGUID[] = "sync.session_sync_guid";
diff --git a/components/sync_driver/pref_names.h b/components/sync_driver/pref_names.h
index 31a605a..5eb8578 100644
--- a/components/sync_driver/pref_names.h
+++ b/components/sync_driver/pref_names.h
@@ -57,8 +57,6 @@ extern const char kSyncUsingSecondaryPassphrase[];
 extern const char kSyncEncryptionBootstrapToken[];
 extern const char kSyncKeystoreEncryptionBootstrapToken[];
 
-extern const char kSyncAcknowledgedSyncTypes[];
-
 extern const char kSyncSessionsGUID[];
 
 #if defined(OS_CHROMEOS)
diff --git a/components/sync_driver/sync_prefs.cc b/components/sync_driver/sync_prefs.cc
index 23ccbbf..c1c228ac 100644
--- a/components/sync_driver/sync_prefs.cc
+++ b/components/sync_driver/sync_prefs.cc
@@ -121,30 +121,6 @@ void SyncPrefs::RegisterProfilePrefs(
       std::string(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 
-  // We will start prompting people about new data types after the launch of
-  // SESSIONS - all previously launched data types are treated as if they are
-  // already acknowledged.
-  syncer::ModelTypeSet model_set;
-  model_set.Put(syncer::BOOKMARKS);
-  model_set.Put(syncer::PREFERENCES);
-  model_set.Put(syncer::PASSWORDS);
-  model_set.Put(syncer::AUTOFILL_PROFILE);
-  model_set.Put(syncer::AUTOFILL_WALLET_DATA);
-  model_set.Put(syncer::AUTOFILL);
-  model_set.Put(syncer::THEMES);
-  model_set.Put(syncer::EXTENSIONS);
-  model_set.Put(syncer::NIGORI);
-  model_set.Put(syncer::SEARCH_ENGINES);
-  model_set.Put(syncer::APPS);
-  model_set.Put(syncer::APP_LIST);
-  model_set.Put(syncer::TYPED_URLS);
-  model_set.Put(syncer::SESSIONS);
-  model_set.Put(syncer::ARTICLES);
-  model_set.Put(syncer::WIFI_CREDENTIALS);
-  registry->RegisterListPref(prefs::kSyncAcknowledgedSyncTypes,
-                             syncer::ModelTypeSetToValue(model_set),
-                             user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-
   registry->RegisterIntegerPref(
       prefs::kSyncRemainingRollbackTries, 0,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
@@ -372,20 +348,6 @@ void SyncPrefs::SetSpareBootstrapToken(const std::string& token) {
 }
 #endif
 
-void SyncPrefs::AcknowledgeSyncedTypes(syncer::ModelTypeSet types) {
-  DCHECK(CalledOnValidThread());
-  // Add the types to the current set of acknowledged
-  // types, and then store the resulting set in prefs.
-  const syncer::ModelTypeSet acknowledged_types =
-      Union(types,
-            syncer::ModelTypeSetFromValue(
-                *pref_service_->GetList(prefs::kSyncAcknowledgedSyncTypes)));
-
-  scoped_ptr<base::ListValue> value(
-      syncer::ModelTypeSetToValue(acknowledged_types));
-  pref_service_->Set(prefs::kSyncAcknowledgedSyncTypes, *value);
-}
-
 int SyncPrefs::GetRemainingRollbackTries() const {
   return pref_service_->GetInteger(prefs::kSyncRemainingRollbackTries);
 }
@@ -406,12 +368,6 @@ void SyncPrefs::SetManagedForTest(bool is_managed) {
   pref_service_->SetBoolean(prefs::kSyncManaged, is_managed);
 }
 
-syncer::ModelTypeSet SyncPrefs::GetAcknowledgeSyncedTypesForTest() const {
-  DCHECK(CalledOnValidThread());
-  return syncer::ModelTypeSetFromValue(
-      *pref_service_->GetList(prefs::kSyncAcknowledgedSyncTypes));
-}
-
 void SyncPrefs::RegisterPrefGroups() {
   pref_groups_[syncer::APPS].Put(syncer::APP_NOTIFICATIONS);
   pref_groups_[syncer::APPS].Put(syncer::APP_SETTINGS);
diff --git a/components/sync_driver/sync_prefs.h b/components/sync_driver/sync_prefs.h
index d0bac28..a65f0b3ad 100644
--- a/components/sync_driver/sync_prefs.h
+++ b/components/sync_driver/sync_prefs.h
@@ -123,9 +123,6 @@ class SyncPrefs : NON_EXPORTED_BASE(public base::NonThreadSafe),
   void SetSpareBootstrapToken(const std::string& token);
 #endif
 
-  // Merges the given set of types with the set of acknowledged types.
-  void AcknowledgeSyncedTypes(syncer::ModelTypeSet types);
-
   // Get/Set number of rollback attempts allowed.
   virtual int GetRemainingRollbackTries() const;
   virtual void SetRemainingRollbackTries(int times);
@@ -139,7 +136,6 @@ class SyncPrefs : NON_EXPORTED_BASE(public base::NonThreadSafe),
   // For testing.
 
   void SetManagedForTest(bool is_managed);
-  syncer::ModelTypeSet GetAcknowledgeSyncedTypesForTest() const;
 
  private:
   void RegisterPrefGroups();
diff --git a/components/sync_driver/sync_prefs_unittest.cc b/components/sync_driver/sync_prefs_unittest.cc
index b1f3423..bcfbc7b 100644
--- a/components/sync_driver/sync_prefs_unittest.cc
+++ b/components/sync_driver/sync_prefs_unittest.cc
@@ -201,21 +201,6 @@ TEST_F(SyncPrefsTest, ObservedPrefs) {
   sync_prefs.RemoveSyncPrefObserver(&mock_sync_pref_observer);
 }
 
-TEST_F(SyncPrefsTest, AcknowledgeSyncedTypes) {
-  SyncPrefs sync_prefs(&pref_service_);
-
-  syncer::ModelTypeSet expected_acknowledge_synced_types =
-      sync_prefs.GetAcknowledgeSyncedTypesForTest();
-  for (int i = syncer::EXTENSION_SETTINGS; i < syncer::MODEL_TYPE_COUNT; ++i) {
-    const syncer::ModelType type = syncer::ModelTypeFromInt(i);
-    syncer::ModelTypeSet acknowledge_synced_types(type);
-    expected_acknowledge_synced_types.Put(type);
-    sync_prefs.AcknowledgeSyncedTypes(acknowledge_synced_types);
-    EXPECT_TRUE(expected_acknowledge_synced_types.Equals(
-        sync_prefs.GetAcknowledgeSyncedTypesForTest()));
-  }
-}
-
 TEST_F(SyncPrefsTest, ClearPreferences) {
   SyncPrefs sync_prefs(&pref_service_);