sync: Introduce control data types

sync/syncable/nigori_util.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 "sync/syncable/nigori_util.h"
 
 #include <queue>
 #include <string>
 #include <vector>
 
@@ skipping 52 matching lines @@
       return false;
   }
   return true;
 }
 
 bool EntryNeedsEncryption(ModelTypeSet encrypted_types,
                           const Entry& entry) {
   if (!entry.Get(UNIQUE_SERVER_TAG).empty())
     return false;  // We don't encrypt unique server nodes.
   ModelType type = entry.GetModelType();
-  if (type == PASSWORDS || type == NIGORI)
+  if (type == PASSWORDS || IsControlType(type))
     return false;
   // Checking NON_UNIQUE_NAME is not necessary for the correctness of encrypting
   // the data, nor for determining if data is encrypted. We simply ensure it has
   // been overwritten to avoid any possible leaks of sensitive data.
   return SpecificsNeedsEncryption(encrypted_types, entry.Get(SPECIFICS)) ||
          (encrypted_types.Has(type) &&
           entry.Get(NON_UNIQUE_NAME) != kEncryptedString);
 }
 
 bool SpecificsNeedsEncryption(ModelTypeSet encrypted_types,
                               const sync_pb::EntitySpecifics& specifics) {
   const ModelType type = GetModelTypeFromSpecifics(specifics);
-  if (type == PASSWORDS || type == NIGORI)
+  if (type == PASSWORDS || IsControlType(type))
     return false;  // These types have their own encryption schemes.
   if (!encrypted_types.Has(type))
     return false;  // This type does not require encryption
   return !specifics.has_encrypted();
 }
 
 // Mainly for testing.
 bool VerifyDataTypeEncryptionForTest(
     BaseTransaction* const trans,
     ModelType type,
     bool is_encrypted) {
   Cryptographer* cryptographer = trans->directory()->GetCryptographer(trans);
-  if (type == PASSWORDS || type == NIGORI) {
+  if (type == PASSWORDS || IsControlType(type)) {
     NOTREACHED();
     return true;
   }
   std::string type_tag = ModelTypeToRootTag(type);
   Entry type_root(trans, GET_BY_SERVER_TAG, type_tag);
   if (!type_root.good()) {
     NOTREACHED();
     return false;
   }
 
@@ skipping 198 matching lines @@
     encrypted_types.Put(APP_SETTINGS);
   if (nigori.encrypt_apps())
     encrypted_types.Put(APPS);
   if (nigori.encrypt_app_notifications())
     encrypted_types.Put(APP_NOTIFICATIONS);
   return encrypted_types;
 }
 
 }  // namespace syncable
 }  // namespace syncer