Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(540)

Unified Diff: components/sync/syncable/mutable_entry.cc

Issue 2502253003: [Sync] Move GenerateSyncableHash to base. (Closed)
Patch Set: Keep full syncable/ DEP. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/sync/syncable/mutable_entry.cc
diff --git a/components/sync/syncable/mutable_entry.cc b/components/sync/syncable/mutable_entry.cc
index cd396537adf4908763280efb2c9633f3eb20f95d..97a34db68fa2d37480e032a4f9b60dbba3ceb864 100644
--- a/components/sync/syncable/mutable_entry.cc
+++ b/components/sync/syncable/mutable_entry.cc
@@ -6,12 +6,12 @@
#include <memory>
+#include "components/sync/base/hash_util.h"
#include "components/sync/base/unique_position.h"
#include "components/sync/syncable/directory.h"
#include "components/sync/syncable/scoped_kernel_lock.h"
#include "components/sync/syncable/scoped_parent_child_index_updater.h"
#include "components/sync/syncable/syncable_changes_version.h"
-#include "components/sync/syncable/syncable_util.h"
#include "components/sync/syncable/syncable_write_transaction.h"
using std::string;
@@ -81,7 +81,7 @@ MutableEntry::MutableEntry(WriteTransaction* trans,
// We need to have a valid position ready before we can index the item.
if (model_type == BOOKMARKS) {
// Base the tag off of our cache-guid and local "c-" style ID.
- std::string unique_tag = syncable::GenerateSyncableBookmarkHash(
+ std::string unique_tag = GenerateSyncableBookmarkHash(
trans->directory()->cache_guid(), GetId().GetServerId());
kernel_->put(UNIQUE_BOOKMARK_TAG, unique_tag);
kernel_->put(UNIQUE_POSITION, UniquePosition::InitialPosition(unique_tag));
« no previous file with comments | « components/sync/syncable/model_neutral_mutable_entry.cc ('k') | components/sync/syncable/parent_child_index_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698