Revert "Revert 182527" ([Sync] Make SESSIONS an implicit type)

sync/syncable/nigori_util.cc

 // Copyright 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 "sync/syncable/nigori_util.h"
 
 #include <queue>
 #include <string>
 #include <vector>
 
@@ skipping 234 matching lines @@
            << ModelTypeToString(type)
            << " and marking for syncing.";
   syncable::MarkForSyncing(entry);
   return true;
 }
 
 void UpdateNigoriFromEncryptedTypes(ModelTypeSet encrypted_types,
                                     bool encrypt_everything,
                                     sync_pb::NigoriSpecifics* nigori) {
   nigori->set_encrypt_everything(encrypt_everything);
-  COMPILE_ASSERT(25 == MODEL_TYPE_COUNT, UpdateEncryptedTypes);
+  COMPILE_ASSERT(26 == MODEL_TYPE_COUNT, UpdateEncryptedTypes);
   nigori->set_encrypt_bookmarks(
       encrypted_types.Has(BOOKMARKS));
   nigori->set_encrypt_preferences(
       encrypted_types.Has(PREFERENCES));
   nigori->set_encrypt_autofill_profile(
       encrypted_types.Has(AUTOFILL_PROFILE));
   nigori->set_encrypt_autofill(encrypted_types.Has(AUTOFILL));
   nigori->set_encrypt_themes(encrypted_types.Has(THEMES));
   nigori->set_encrypt_typed_urls(
       encrypted_types.Has(TYPED_URLS));
@@ skipping 13 matching lines @@
   nigori->set_encrypt_favicon_images(encrypted_types.Has(FAVICON_IMAGES));
   nigori->set_encrypt_favicon_tracking(encrypted_types.Has(FAVICON_TRACKING));
 }
 
 ModelTypeSet GetEncryptedTypesFromNigori(
     const sync_pb::NigoriSpecifics& nigori) {
   if (nigori.encrypt_everything())
     return ModelTypeSet::All();
 
   ModelTypeSet encrypted_types;
-  COMPILE_ASSERT(25 == MODEL_TYPE_COUNT, UpdateEncryptedTypes);
+  COMPILE_ASSERT(26 == MODEL_TYPE_COUNT, UpdateEncryptedTypes);
   if (nigori.encrypt_bookmarks())
     encrypted_types.Put(BOOKMARKS);
   if (nigori.encrypt_preferences())
     encrypted_types.Put(PREFERENCES);
   if (nigori.encrypt_autofill_profile())
     encrypted_types.Put(AUTOFILL_PROFILE);
   if (nigori.encrypt_autofill())
     encrypted_types.Put(AUTOFILL);
   if (nigori.encrypt_themes())
     encrypted_types.Put(THEMES);
@@ skipping 17 matching lines @@
     encrypted_types.Put(DICTIONARY);
   if (nigori.encrypt_favicon_images())
     encrypted_types.Put(FAVICON_IMAGES);
   if (nigori.encrypt_favicon_tracking())
     encrypted_types.Put(FAVICON_TRACKING);
   return encrypted_types;
 }
 
 }  // namespace syncable
 }  // namespace syncer