WIP: The Bookmark Position Megapatch

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 90 matching lines @@
     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;
   }
 
   std::queue<Id> to_visit;
-  Id id_string;
-  if (!trans->directory()->GetFirstChildId(
-          trans, type_root.Get(ID), &id_string)) {
-    NOTREACHED();
-    return false;
-  }
+  Id id_string = type_root.GetFirstChildId();
   to_visit.push(id_string);
   while (!to_visit.empty()) {
     id_string = to_visit.front();
     to_visit.pop();
     if (id_string.IsRoot())
       continue;
 
     Entry child(trans, GET_BY_ID, id_string);
     if (!child.good()) {
       NOTREACHED();
       return false;
     }
     if (child.Get(IS_DIR)) {
-      Id child_id_string;
-      if (!trans->directory()->GetFirstChildId(
-              trans, child.Get(ID), &child_id_string)) {
-        NOTREACHED();
-        return false;
-      }
+      Id child_id_string = child.GetFirstChildId();
       // Traverse the children.
       to_visit.push(child_id_string);
     }
     const sync_pb::EntitySpecifics& specifics = child.Get(SPECIFICS);
     DCHECK_EQ(type, child.GetModelType());
     DCHECK_EQ(type, GetModelTypeFromSpecifics(specifics));
     // We don't encrypt the server's permanent items.
     if (child.Get(UNIQUE_SERVER_TAG).empty()) {
       if (specifics.has_encrypted() != is_encrypted)
         return false;
       if (specifics.has_encrypted()) {
         if (child.Get(NON_UNIQUE_NAME) != kEncryptedString)
           return false;
         if (!cryptographer->CanDecryptUsingDefaultKey(specifics.encrypted()))
           return false;
       }
     }
     // Push the successor.
-    to_visit.push(child.Get(NEXT_ID));
+    to_visit.push(child.GetSuccessorId());
   }
   return true;
 }
 
 bool UpdateEntryWithEncryption(
     BaseTransaction* const trans,
     const sync_pb::EntitySpecifics& new_specifics,
     syncable::MutableEntry* entry) {
   NigoriHandler* nigori_handler = trans->directory()->GetNigoriHandler();
   Cryptographer* cryptographer = trans->directory()->GetCryptographer(trans);
@@ skipping 143 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