Revert 98770 - Merge 98758 - [Sync] Gracefully handle writing to a node when the cryptographer is...

chrome/browser/sync/syncable/nigori_util.cc

 // Copyright (c) 2011 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/syncable/nigori_util.h"
 
 #include <queue>
 #include <string>
 #include <vector>
 
@@ skipping 45 matching lines @@
     BaseTransaction* const trans,
     const ModelTypeSet& encrypted_types) {
   std::vector<int64> handles;
   browser_sync::SyncerUtil::GetUnsyncedEntries(trans, &handles);
   for (size_t i = 0; i < handles.size(); ++i) {
     Entry entry(trans, GET_BY_HANDLE, handles[i]);
     if (!entry.good()) {
       NOTREACHED();
       return false;
     }
-    if (EntryNeedsEncryption(encrypted_types, entry))
+    const sync_pb::EntitySpecifics& entry_specifics = entry.Get(SPECIFICS);
+    ModelType type = entry.GetModelType();
+    if (type == PASSWORDS)
+      continue;
+    if (encrypted_types.count(type) > 0 &&
+        !entry_specifics.has_encrypted()) {
+      // This datatype requires encryption but this data is not encrypted.
       return false;
+    }
   }
   return true;
 }
 
-bool EntryNeedsEncryption(const ModelTypeSet& encrypted_types,
-                          const Entry& entry) {
-  if (!entry.Get(UNIQUE_SERVER_TAG).empty())
-    return false;  // We don't encrypt unique server nodes.
-  return SpecificsNeedsEncryption(encrypted_types, entry.Get(SPECIFICS));
-}
-
-bool SpecificsNeedsEncryption(const ModelTypeSet& encrypted_types,
-                              const sync_pb::EntitySpecifics& specifics) {
-  ModelType type = GetModelTypeFromSpecifics(specifics);
-  if (type == PASSWORDS || type == NIGORI)
-    return false;  // These types have their own encryption schemes.
-  if (encrypted_types.count(type) == 0)
-    return false;  // This type does not require encryption
-  return !specifics.has_encrypted();
-}
-
 // Mainly for testing.
 bool VerifyDataTypeEncryption(BaseTransaction* const trans,
                               browser_sync::Cryptographer* cryptographer,
                               ModelType type,
                               bool is_encrypted) {
   if (type == PASSWORDS || type == NIGORI) {
     NOTREACHED();
     return true;
   }
   std::string type_tag = ModelTypeToRootTag(type);
@@ skipping 37 matching lines @@
           return false;
       }
     }
     // Push the successor.
     to_visit.push(child.Get(NEXT_ID));
   }
   return true;
 }
 
 }  // namespace syncable