Remove some dead code about "acknowledged types"

components/sync_driver/sync_prefs.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/sync_driver/sync_prefs.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_member.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 103 matching lines @@
   registry->RegisterBooleanPref(
       prefs::kSyncHasAuthError,
       false,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 
   registry->RegisterStringPref(
       prefs::kSyncSessionsGUID,
       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);
 }
 
 void SyncPrefs::AddSyncPrefObserver(SyncPrefObserver* sync_pref_observer) {
   DCHECK(CalledOnValidThread());
   sync_pref_observers_.AddObserver(sync_pref_observer);
 }
 
@@ skipping 207 matching lines @@
   DCHECK(CalledOnValidThread());
   return pref_service_->GetString(prefs::kSyncSpareBootstrapToken);
 }
 
 void SyncPrefs::SetSpareBootstrapToken(const std::string& token) {
   DCHECK(CalledOnValidThread());
   pref_service_->SetString(prefs::kSyncSpareBootstrapToken, 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);
 }
 
 void SyncPrefs::SetRemainingRollbackTries(int times) {
   pref_service_->SetInteger(prefs::kSyncRemainingRollbackTries, times);
 }
 
 void SyncPrefs::OnSyncManagedPrefChanged() {
   DCHECK(CalledOnValidThread());
   FOR_EACH_OBSERVER(SyncPrefObserver,
                     sync_pref_observers_,
                     OnSyncManagedPrefChange(*pref_sync_managed_));
 }
 
 void SyncPrefs::SetManagedForTest(bool is_managed) {
   DCHECK(CalledOnValidThread());
   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);
   pref_groups_[syncer::APPS].Put(syncer::APP_LIST);
 
   pref_groups_[syncer::AUTOFILL].Put(syncer::AUTOFILL_PROFILE);
   pref_groups_[syncer::AUTOFILL].Put(syncer::AUTOFILL_WALLET_DATA);
 
   pref_groups_[syncer::EXTENSIONS].Put(syncer::EXTENSION_SETTINGS);
 
@@ skipping 91 matching lines @@
 
 void SyncPrefs::SetFirstSyncTime(base::Time time) {
   pref_service_->SetInt64(prefs::kSyncFirstSyncTime, time.ToInternalValue());
 }
 
 void SyncPrefs::ClearFirstSyncTime() {
   pref_service_->ClearPref(prefs::kSyncFirstSyncTime);
 }
 
 }  // namespace sync_driver