chrome/browser/sync/syncable/directory_backing_store.h - Issue 8770032: [Sync] Implement encryption-aware conflict resolution.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/syncable/directory_backing_store.h

Issue 8770032: [Sync] Implement encryption-aware conflict resolution. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix test Created 9 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/sync/syncable/directory_backing_store.h

diff --git a/chrome/browser/sync/syncable/directory_backing_store.h b/chrome/browser/sync/syncable/directory_backing_store.h

index 460da338f144a40552813d35d78317dd7e2264e3..697675a31a55861713222460ff3fba5023668ace 100644

--- a/chrome/browser/sync/syncable/directory_backing_store.h

+++ b/chrome/browser/sync/syncable/directory_backing_store.h

@@ -85,6 +85,7 @@ class DirectoryBackingStore {

FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, MigrateVersion74To75);

FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, MigrateVersion75To76);

FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, MigrateVersion76To77);

+ FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, MigrateVersion77To78);

FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, ModelTypeIds);

FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, Corruption);

FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, DeleteEntries);

@@ -183,6 +184,7 @@ class DirectoryBackingStore {

bool MigrateVersion74To75();

bool MigrateVersion75To76();

bool MigrateVersion76To77();

+ bool MigrateVersion77To78();

// The handle to our sqlite on-disk store for initialization and loading, and

// for saving changes periodically via SaveChanges, respectively.