[Sync] Implement encryption-aware conflict resolution.

chrome/browser/sync/syncable/directory_backing_store.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_SYNC_SYNCABLE_DIRECTORY_BACKING_STORE_H_
 #define CHROME_BROWSER_SYNC_SYNCABLE_DIRECTORY_BACKING_STORE_H_
 #pragma once
 
 #include <string>
 
@@ skipping 67 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, MigrateVersion67To68);
   FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, MigrateVersion68To69);
   FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, MigrateVersion69To70);
   FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, MigrateVersion70To71);
   FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, MigrateVersion71To72);
   FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, MigrateVersion72To73);
   FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest, MigrateVersion73To74);
   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);
   FRIEND_TEST_ALL_PREFIXES(MigrationTest, ToCurrentVersion);
   friend class MigrationTest;
 
   // General Directory initialization and load helpers.
   DirOpenResult InitializeTables();
   // Returns an sqlite return code, usually SQLITE_DONE.
   int CreateTables();
@@ skipping 78 matching lines @@
   bool MigrateVersion67To68();
   bool MigrateVersion68To69();
   bool MigrateVersion69To70();
   bool MigrateVersion70To71();
   bool MigrateVersion71To72();
   bool MigrateVersion72To73();
   bool MigrateVersion73To74();
   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.
   // TODO(timsteele): We should only have one handle here.  The reason we need
   // two at the moment is because the DB can be opened by either the AuthWatcher
   // or SyncCore threads, but SaveChanges is always called by the latter.  We
   // need to change initialization so the DB is only accessed from one thread.
   sqlite3* load_dbhandle_;
   sqlite3* save_dbhandle_;
 
   std::string dir_name_;
   FilePath backing_filepath_;
 
   // Set to true if migration left some old columns around that need to be
   // discarded.
   bool needs_column_refresh_;
 
   DISALLOW_COPY_AND_ASSIGN(DirectoryBackingStore);
 };
 
 }  // namespace syncable
 
 #endif  // CHROME_BROWSER_SYNC_SYNCABLE_DIRECTORY_BACKING_STORE_H_