[Sync] Add history delete directive type

chrome/browser/sync/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 "chrome/browser/sync/sync_prefs.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
@@ skipping 102 matching lines @@
       pref_service_->GetBoolean(prefs::kSyncKeepEverythingSynced);
 }
 
 void SyncPrefs::SetKeepEverythingSynced(bool keep_everything_synced) {
   DCHECK(CalledOnValidThread());
   CHECK(pref_service_);
   pref_service_->SetBoolean(prefs::kSyncKeepEverythingSynced,
                             keep_everything_synced);
 }
 
+// TODO(akalin): If encryption is turned on for all data types,
+// history delete directives are useless and so we shouldn't bother
+// enabling them.
+
 syncer::ModelTypeSet SyncPrefs::GetPreferredDataTypes(
     syncer::ModelTypeSet registered_types) const {
   DCHECK(CalledOnValidThread());
   if (!pref_service_) {
     return syncer::ModelTypeSet();
   }
 
   // First remove any datatypes that are inconsistent with the current policies
   // on the client (so that "keep everything synced" doesn't include them).
   if (pref_service_->HasPrefPath(prefs::kSavingBrowserHistoryDisabled) &&
@@ skipping 82 matching lines @@
     case syncer::APP_SETTINGS:
       return prefs::kSyncAppSettings;
     case syncer::APPS:
       return prefs::kSyncApps;
     case syncer::SEARCH_ENGINES:
       return prefs::kSyncSearchEngines;
     case syncer::SESSIONS:
       return prefs::kSyncSessions;
     case syncer::APP_NOTIFICATIONS:
       return prefs::kSyncAppNotifications;
+    case syncer::HISTORY_DELETE_DIRECTIVES:
+      return prefs::kSyncHistoryDeleteDirectives;
     default:
       break;
   }
   NOTREACHED();
   return NULL;
 }
 
 #if defined(OS_CHROMEOS)
 std::string SyncPrefs::GetSpareBootstrapToken() const {
   DCHECK(CalledOnValidThread());
@@ skipping 198 matching lines @@
     if (types.Has(i->first))
       types_with_groups.PutAll(i->second);
     else
       types_with_groups.RemoveAll(i->second);
   }
   types_with_groups.RetainAll(registered_types);
   return types_with_groups;
 }
 
 }  // namespace browser_sync