[Sync] Refactor GetEncryptedTypes usage.

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>
 
 #include "base/json/json_writer.h"
 #include "sync/syncable/directory.h"
 #include "sync/syncable/entry.h"
+#include "sync/syncable/nigori_handler.h"
 #include "sync/syncable/mutable_entry.h"
 #include "sync/syncable/syncable_util.h"
 #include "sync/syncable/write_transaction.h"
 #include "sync/util/cryptographer.h"
 
 namespace syncer {
 namespace syncable {
 
 bool ProcessUnsyncedChangesForEncryption(
-    WriteTransaction* const trans,
-    Cryptographer* cryptographer) {
+    WriteTransaction* const trans) {
+  NigoriHandler* nigori_handler = trans->directory()->GetNigoriHandler();
+  ModelTypeSet encrypted_types = nigori_handler->GetEncryptedTypes(trans);
+  Cryptographer* cryptographer = trans->directory()->GetCryptographer(trans);
   DCHECK(cryptographer->is_ready());
+
   // Get list of all datatypes with unsynced changes. It's possible that our
   // local changes need to be encrypted if encryption for that datatype was
   // just turned on (and vice versa).
   // Note: we do not attempt to re-encrypt data with a new key here as key
   // changes in this code path are likely due to consistency issues (we have
   // to be updated to a key we already have, e.g. an old key).
   std::vector<int64> handles;
   GetUnsyncedEntries(trans, &handles);
   for (size_t i = 0; i < handles.size(); ++i) {
     MutableEntry entry(trans, GET_BY_HANDLE, handles[i]);
     const sync_pb::EntitySpecifics& specifics = entry.Get(SPECIFICS);
     // Ignore types that don't need encryption or entries that are already
     // encrypted.
-    if (!SpecificsNeedsEncryption(cryptographer->GetEncryptedTypes(),
-                                  specifics)) {
+    if (!SpecificsNeedsEncryption(encrypted_types, specifics))
       continue;
-    }
-    if (!UpdateEntryWithEncryption(cryptographer, specifics, &entry)) {
-      NOTREACHED();
+    if (!UpdateEntryWithEncryption(trans, specifics, &entry))
       return false;
-    }
   }
   return true;
 }
 
 bool VerifyUnsyncedChangesAreEncrypted(
     BaseTransaction* const trans,
     ModelTypeSet encrypted_types) {
   std::vector<int64> handles;
   GetUnsyncedEntries(trans, &handles);
   for (size_t i = 0; i < handles.size(); ++i) {
@@ skipping 29 matching lines @@
   if (type == PASSWORDS || type == NIGORI)
     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,
-    Cryptographer* cryptographer,
     ModelType type,
     bool is_encrypted) {
+  Cryptographer* cryptographer = trans->directory()->GetCryptographer(trans);
   if (type == PASSWORDS || type == NIGORI) {
     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 41 matching lines @@
           return false;
       }
     }
     // Push the successor.
     to_visit.push(child.Get(NEXT_ID));
   }
   return true;
 }
 
 bool UpdateEntryWithEncryption(
-    Cryptographer* cryptographer,
+    BaseTransaction* const trans,
     const sync_pb::EntitySpecifics& new_specifics,
     syncable::MutableEntry* entry) {
+  NigoriHandler* nigori_handler = trans->directory()->GetNigoriHandler();
+  Cryptographer* cryptographer = trans->directory()->GetCryptographer(trans);
   ModelType type = GetModelTypeFromSpecifics(new_specifics);
   DCHECK_GE(type, FIRST_REAL_MODEL_TYPE);
   const sync_pb::EntitySpecifics& old_specifics = entry->Get(SPECIFICS);
-  const ModelTypeSet encrypted_types = cryptographer->GetEncryptedTypes();
+  const ModelTypeSet encrypted_types = nigori_handler->GetEncryptedTypes(trans);
   // It's possible the nigori lost the set of encrypted types. If the current
   // specifics are already encrypted, we want to ensure we continue encrypting.
   bool was_encrypted = old_specifics.has_encrypted();
   sync_pb::EntitySpecifics generated_specifics;
   if (new_specifics.has_encrypted()) {
     NOTREACHED() << "New specifics already has an encrypted blob.";
     return false;
   }
   if ((!SpecificsNeedsEncryption(encrypted_types, new_specifics) &&
        !was_encrypted) ||
@@ skipping 129 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