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

Unified Diff: sync/syncable/in_memory_directory_backing_store.cc

Issue 1136953013: Sync: Change Local IDs to GUID based to avoid ID collision (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed setting KERNEL_SHARE_INFO_DIRTY when incrementing transaction version Created 5 years, 7 months 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: sync/syncable/in_memory_directory_backing_store.cc
diff --git a/sync/syncable/in_memory_directory_backing_store.cc b/sync/syncable/in_memory_directory_backing_store.cc
index 6e847eedbe93aa04b19ee7b053bc89ab9c1d317d..da668c4740d87f894b5fae6a6848028addf47f35 100644
--- a/sync/syncable/in_memory_directory_backing_store.cc
+++ b/sync/syncable/in_memory_directory_backing_store.cc
@@ -9,8 +9,7 @@ namespace syncable {
InMemoryDirectoryBackingStore::InMemoryDirectoryBackingStore(
const std::string& dir_name)
- : DirectoryBackingStore(dir_name),
- consistent_cache_guid_requested_(false) {
+ : DirectoryBackingStore(dir_name) {
}
DirOpenResult InMemoryDirectoryBackingStore::Load(
@@ -26,14 +25,6 @@ DirOpenResult InMemoryDirectoryBackingStore::Load(
if (!InitializeTables())
return FAILED_OPEN_DATABASE;
- if (consistent_cache_guid_requested_) {
- if (!db()->Execute(
- "UPDATE share_info "
- "SET cache_guid = 'IrcjZ2jyzHDV9Io4+zKcXQ=='")) {
- return FAILED_OPEN_DATABASE;
- }
- }
-
if (!LoadEntries(handles_map, metahandles_to_purge))
return FAILED_DATABASE_CORRUPT;
if (!LoadDeleteJournals(delete_journals))

Powered by Google App Engine
This is Rietveld 408576698