[Sync] Implement encryption-aware conflict resolution.

chrome/browser/sync/syncable/syncable.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_SYNCABLE_H_
 #define CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_
 #pragma once
 
 #include <algorithm>
 #include <bitset>
@@ skipping 159 matching lines @@
 enum {
   STRING_FIELDS_COUNT = STRING_FIELDS_END - STRING_FIELDS_BEGIN,
   PROTO_FIELDS_BEGIN = STRING_FIELDS_END
 };
 
 // From looking at the sqlite3 docs, it's not directly stated, but it
 // seems the overhead for storing a NULL blob is very small.
 enum ProtoField {
   SPECIFICS = PROTO_FIELDS_BEGIN,
   SERVER_SPECIFICS,
+  BASE_SERVER_SPECIFICS,
   PROTO_FIELDS_END,
 };
 
 enum {
   PROTO_FIELDS_COUNT = PROTO_FIELDS_END - PROTO_FIELDS_BEGIN
 };
 
 enum {
   FIELD_COUNT = PROTO_FIELDS_END,
   // Past this point we have temporaries, stored in memory only.
@@ skipping 541 matching lines @@
 //   are protected and only called from friends in a transaction
 //   or are public and take a Transaction* argument.
 //
 // All methods which require the kernel lock to be already held take a
 // ScopeKernelLock* argument.
 //
 // To prevent deadlock, the reader writer transaction lock must always
 // be held before acquiring the kernel lock.
 class ScopedKernelLock;
 class IdFilter;
-class DirectoryManager;
 
 class Directory {
   friend class BaseTransaction;
   friend class Entry;
   friend class MutableEntry;
   friend class ReadTransaction;
   friend class ReadTransactionWithoutDB;
   friend class ScopedKernelLock;
   friend class ScopedKernelUnlock;
   friend class WriteTransaction;
@@ skipping 528 matching lines @@
 bool IsLegalNewParent(BaseTransaction* trans, const Id& id, const Id& parentid);
 
 // This function sets only the flags needed to get this entry to sync.
 void MarkForSyncing(syncable::MutableEntry* e);
 
 }  // namespace syncable
 
 std::ostream& operator <<(std::ostream&, const syncable::Blob&);
 
 #endif  // CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_