[Sync] Clean up ModelType code.

components/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 "components/sync/syncable/nigori_util.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 228 matching lines @@
   DVLOG(1) << "Overwriting specifics of type " << 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);
-  static_assert(39 == MODEL_TYPE_COUNT, "update encrypted types");
+  static_assert(39 == MODEL_TYPE_COUNT,
+                "If adding an encryptable type, update handling below.");
   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_autofill_wallet_metadata(
       encrypted_types.Has(AUTOFILL_WALLET_METADATA));
   nigori->set_encrypt_themes(encrypted_types.Has(THEMES));
   nigori->set_encrypt_typed_urls(encrypted_types.Has(TYPED_URLS));
-  nigori->set_encrypt_extension_settings(
-      encrypted_types.Has(EXTENSION_SETTINGS));
   nigori->set_encrypt_extensions(encrypted_types.Has(EXTENSIONS));
   nigori->set_encrypt_search_engines(encrypted_types.Has(SEARCH_ENGINES));
   nigori->set_encrypt_sessions(encrypted_types.Has(SESSIONS));
+  nigori->set_encrypt_apps(encrypted_types.Has(APPS));
   nigori->set_encrypt_app_settings(encrypted_types.Has(APP_SETTINGS));
-  nigori->set_encrypt_apps(encrypted_types.Has(APPS));
+  nigori->set_encrypt_extension_settings(
+      encrypted_types.Has(EXTENSION_SETTINGS));
   nigori->set_encrypt_app_notifications(encrypted_types.Has(APP_NOTIFICATIONS));
   nigori->set_encrypt_dictionary(encrypted_types.Has(DICTIONARY));
   nigori->set_encrypt_favicon_images(encrypted_types.Has(FAVICON_IMAGES));
   nigori->set_encrypt_favicon_tracking(encrypted_types.Has(FAVICON_TRACKING));
   nigori->set_encrypt_articles(encrypted_types.Has(ARTICLES));
   nigori->set_encrypt_app_list(encrypted_types.Has(APP_LIST));
   nigori->set_encrypt_arc_package(encrypted_types.Has(ARC_PACKAGE));
   nigori->set_encrypt_printers(encrypted_types.Has(PRINTERS));
   nigori->set_encrypt_reading_list(encrypted_types.Has(READING_LIST));
 }
 
 ModelTypeSet GetEncryptedTypesFromNigori(
     const sync_pb::NigoriSpecifics& nigori) {
   if (nigori.encrypt_everything())
     return ModelTypeSet::All();
 
   ModelTypeSet encrypted_types;
-  static_assert(39 == MODEL_TYPE_COUNT, "update encrypted types");
+  static_assert(39 == MODEL_TYPE_COUNT,
+                "If adding an encryptable type, update handling below.");
   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_autofill_wallet_metadata())
     encrypted_types.Put(AUTOFILL_WALLET_METADATA);
   if (nigori.encrypt_themes())
     encrypted_types.Put(THEMES);
   if (nigori.encrypt_typed_urls())
     encrypted_types.Put(TYPED_URLS);
-  if (nigori.encrypt_extension_settings())
-    encrypted_types.Put(EXTENSION_SETTINGS);
   if (nigori.encrypt_extensions())
     encrypted_types.Put(EXTENSIONS);
   if (nigori.encrypt_search_engines())
     encrypted_types.Put(SEARCH_ENGINES);
   if (nigori.encrypt_sessions())
     encrypted_types.Put(SESSIONS);
+  if (nigori.encrypt_apps())
+    encrypted_types.Put(APPS);
   if (nigori.encrypt_app_settings())
     encrypted_types.Put(APP_SETTINGS);
-  if (nigori.encrypt_apps())
-    encrypted_types.Put(APPS);
+  if (nigori.encrypt_extension_settings())
+    encrypted_types.Put(EXTENSION_SETTINGS);
   if (nigori.encrypt_app_notifications())
     encrypted_types.Put(APP_NOTIFICATIONS);
   if (nigori.encrypt_dictionary())
     encrypted_types.Put(DICTIONARY);
   if (nigori.encrypt_favicon_images())
     encrypted_types.Put(FAVICON_IMAGES);
   if (nigori.encrypt_favicon_tracking())
     encrypted_types.Put(FAVICON_TRACKING);
   if (nigori.encrypt_articles())
     encrypted_types.Put(ARTICLES);
   if (nigori.encrypt_app_list())
     encrypted_types.Put(APP_LIST);
   if (nigori.encrypt_arc_package())
     encrypted_types.Put(ARC_PACKAGE);
   if (nigori.encrypt_printers())
     encrypted_types.Put(PRINTERS);
   if (nigori.encrypt_reading_list())
     encrypted_types.Put(READING_LIST);
   return encrypted_types;
 }
 
 }  // namespace syncable
 }  // namespace syncer