WIP: The Bookmark Position Megapatch

sync/internal_api/read_node.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/internal_api/public/read_node.h"
 
 #include "base/logging.h"
 #include "sync/internal_api/public/base_transaction.h"
 #include "sync/syncable/base_transaction.h"
 #include "sync/syncable/entry.h"
+#include "sync/syncable/syncable_util.h"
 
 namespace syncer {
 
 //////////////////////////////////////////////////////////////////////////
 // ReadNode member definitions
 ReadNode::ReadNode(const BaseTransaction* transaction)
     : entry_(NULL), transaction_(transaction) {
   DCHECK(transaction);
 }
 
@@ skipping 29 matching lines @@
   return DecryptIfNecessary() ? INIT_OK : INIT_FAILED_DECRYPT_IF_NECESSARY;
 }
 
 BaseNode::InitByLookupResult ReadNode::InitByClientTagLookup(
     ModelType model_type,
     const std::string& tag) {
   DCHECK(!entry_) << "Init called twice";
   if (tag.empty())
     return INIT_FAILED_PRECONDITION;
 
-  const std::string hash = GenerateSyncableHash(model_type, tag);
+  const std::string hash = syncable::GenerateSyncableHash(model_type, tag);
 
   entry_ = new syncable::Entry(transaction_->GetWrappedTrans(),
                                syncable::GET_BY_CLIENT_TAG, hash);
   if (!entry_->good())
     return INIT_FAILED_ENTRY_NOT_GOOD;
   if (entry_->Get(syncable::IS_DEL))
     return INIT_FAILED_ENTRY_IS_DEL;
   return DecryptIfNecessary() ? INIT_OK : INIT_FAILED_DECRYPT_IF_NECESSARY;
 }
 
@@ skipping 16 matching lines @@
     return INIT_FAILED_ENTRY_NOT_GOOD;
   if (entry_->Get(syncable::IS_DEL))
     return INIT_FAILED_ENTRY_IS_DEL;
   ModelType model_type = GetModelType();
   LOG_IF(WARNING, model_type == UNSPECIFIED || model_type == TOP_LEVEL_FOLDER)
       << "SyncAPI InitByTagLookup referencing unusually typed object.";
   return DecryptIfNecessary() ? INIT_OK : INIT_FAILED_DECRYPT_IF_NECESSARY;
 }
 
 }  // namespace syncer