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

Unified Diff: components/sync/syncable/directory_backing_store.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/directory_backing_store.cc
diff --git a/components/sync/syncable/directory_backing_store.cc b/components/sync/syncable/directory_backing_store.cc
index 580d7e61484d10060f13266cbc6de207fce2ca1e..07867bb76398edac24d937535f53cffd7c5d250d 100644
--- a/components/sync/syncable/directory_backing_store.cc
+++ b/components/sync/syncable/directory_backing_store.cc
@@ -22,13 +22,13 @@
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
#include "build/build_config.h"
+#include "components/sync/base/hash_util.h"
#include "components/sync/base/node_ordinal.h"
#include "components/sync/base/time.h"
#include "components/sync/protocol/bookmark_specifics.pb.h"
#include "components/sync/protocol/sync.pb.h"
#include "components/sync/syncable/syncable_columns.h"
#include "components/sync/syncable/syncable_id.h"
-#include "components/sync/syncable/syncable_util.h"
#include "sql/error_delegate_util.h"
#include "sql/transaction.h"
@@ -1384,9 +1384,8 @@ bool DirectoryBackingStore::MigrateVersion85To86() {
// means we can set the bookmark tag according to the originator client
// item ID and originator cache guid, because (unlike the other case) we
// know that this client is the originator.
- unique_bookmark_tag = syncable::GenerateSyncableBookmarkHash(
- cache_guid,
- id_string.substr(1));
+ unique_bookmark_tag =
+ GenerateSyncableBookmarkHash(cache_guid, id_string.substr(1));
} else {
// If we've already committed the item, then we don't know who the
// originator was. We do not have access to the originator client item
@@ -1400,7 +1399,7 @@ bool DirectoryBackingStore::MigrateVersion85To86() {
// tag according to the originator_cache_guid and originator_item_id
// when we see updates for this item. That should ensure that commonly
// modified items will end up with the proper tag values eventually.
- unique_bookmark_tag = syncable::GenerateSyncableBookmarkHash(
+ unique_bookmark_tag = GenerateSyncableBookmarkHash(
std::string(), // cache_guid left intentionally blank.
id_string.substr(1));
}
« no previous file with comments | « components/sync/model_impl/shared_model_type_processor.cc ('k') | components/sync/syncable/model_neutral_mutable_entry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698