[Sync] Move 'sync' target to sync/

Also move related test files.

Move WriteNode::UpdateEntryWithEncryption to nigori_util.h.

Clean up defines and dependencies.  In particular, get rid of SYNC_ENGINE_VERSION_STRING and hard-code the string in the single place it's used.

Rename data_encryption.* to data_encryption_win.* and add a pragma for crypt32.lib.

Clean up exit-time constructor warnings in sync{able,er}_unittest.cc.

Remove some unused files.

BUG=117585
TEST=
TBR=jhawkins@chromium.org

Review URL: https://chromiumcodereview.appspot.com/9699057

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126872 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 137 insertions, 0 deletions

diff --git a/sync/engine/syncer_util.h b/sync/engine/syncer_util.h
new file mode 100644
index 0000000..026a237
--- /dev/null
+++ b/sync/engine/syncer_util.h
@@ -0,0 +1,137 @@
+// Copyright (c) 2012 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.
+//
+// Utility functions manipulating syncable::Entries, intended for use by the
+// syncer.
+
+#ifndef SYNC_ENGINE_SYNCER_UTIL_H_
+#define SYNC_ENGINE_SYNCER_UTIL_H_
+#pragma once
+
+#include <set>
+#include <string>
+#include <vector>
+
+#include "sync/engine/syncer.h"
+#include "sync/engine/syncer_types.h"
+#include "sync/syncable/syncable.h"
+#include "sync/syncable/syncable_id.h"
+
+namespace browser_sync {
+
+class Cryptographer;
+class SyncEntity;
+
+class SyncerUtil {
+ public:
+  static void ChangeEntryIDAndUpdateChildren(
+      syncable::WriteTransaction* trans,
+      syncable::MutableEntry* entry,
+      const syncable::Id& new_id,
+      syncable::Directory::ChildHandles* children);
+
+  // Returns the number of unsynced entries.
+  static int GetUnsyncedEntries(syncable::BaseTransaction* trans,
+                                std::vector<int64> *handles);
+
+  static void ChangeEntryIDAndUpdateChildren(syncable::WriteTransaction* trans,
+                                             syncable::MutableEntry* entry,
+                                             const syncable::Id& new_id);
+
+  // If the server sent down a client-tagged entry, or an entry whose
+  // commit response was lost, it is necessary to update a local entry
+  // with an ID that doesn't match the ID of the update.  Here, we
+  // find the ID of such an entry, if it exists.  This function may
+  // determine that |server_entry| should be dropped; if so, it returns
+  // the null ID -- callers must handle this case.  When update application
+  // should proceed normally with a new local entry, this function will
+  // return server_entry.id(); the caller must create an entry with that
+  // ID.  This function does not alter the database.
+  static syncable::Id FindLocalIdToUpdate(
+      syncable::BaseTransaction* trans,
+      const SyncEntity& server_entry);
+
+  static UpdateAttemptResponse AttemptToUpdateEntry(
+      syncable::WriteTransaction* const trans,
+      syncable::MutableEntry* const entry,
+      ConflictResolver* resolver,
+      Cryptographer* cryptographer);
+
+  // Pass in name to avoid redundant UTF8 conversion.
+  static void UpdateServerFieldsFromUpdate(
+      syncable::MutableEntry* local_entry,
+      const SyncEntity& server_entry,
+      const std::string& name);
+
+  // Creates a new Entry iff no Entry exists with the given id.
+  static void CreateNewEntry(syncable::WriteTransaction *trans,
+                             const syncable::Id& id);
+
+  static void SplitServerInformationIntoNewEntry(
+      syncable::WriteTransaction* trans,
+      syncable::MutableEntry* entry);
+
+  // This function is called on an entry when we can update the user-facing data
+  // from the server data.
+  static void UpdateLocalDataFromServerData(syncable::WriteTransaction* trans,
+                                            syncable::MutableEntry* entry);
+
+  static VerifyCommitResult ValidateCommitEntry(syncable::Entry* entry);
+
+  static VerifyResult VerifyNewEntry(const SyncEntity& update,
+                                     syncable::Entry* target,
+                                     const bool deleted);
+
+  // Assumes we have an existing entry; check here for updates that break
+  // consistency rules.
+  static VerifyResult VerifyUpdateConsistency(syncable::WriteTransaction* trans,
+                                              const SyncEntity& update,
+                                              syncable::MutableEntry* target,
+                                              const bool deleted,
+                                              const bool is_directory,
+                                              syncable::ModelType model_type);
+
+  // Assumes we have an existing entry; verify an update that seems to be
+  // expressing an 'undelete'
+  static VerifyResult VerifyUndelete(syncable::WriteTransaction* trans,
+                                     const SyncEntity& update,
+                                     syncable::MutableEntry* target);
+
+  // Append |item|, followed by a chain of its predecessors selected by
+  // |inclusion_filter|, to the |commit_ids| vector and tag them as included by
+  // storing in the set |inserted_items|.  |inclusion_filter| (typically one of
+  // IS_UNAPPLIED_UPDATE or IS_UNSYNCED) selects which type of predecessors to
+  // include.  Returns true if |item| was added, and false if it was already in
+  // the list.
+  //
+  // Use AddPredecessorsThenItem instead of this method if you want the
+  // item to be the last, rather than first, item appended.
+  static bool AddItemThenPredecessors(
+      syncable::BaseTransaction* trans,
+      syncable::Entry* item,
+      syncable::IndexedBitField inclusion_filter,
+      syncable::MetahandleSet* inserted_items,
+      std::vector<syncable::Id>* commit_ids);
+
+  // Exactly like AddItemThenPredecessors, except items are appended in the
+  // reverse (and generally more useful) order: a chain of predecessors from
+  // far to near, and finally the item.
+  static void AddPredecessorsThenItem(
+      syncable::BaseTransaction* trans,
+      syncable::Entry* item,
+      syncable::IndexedBitField inclusion_filter,
+      syncable::MetahandleSet* inserted_items,
+      std::vector<syncable::Id>* commit_ids);
+
+  static void MarkDeletedChildrenSynced(
+      syncable::Directory* dir,
+      std::set<syncable::Id>* deleted_folders);
+
+ private:
+  DISALLOW_IMPLICIT_CONSTRUCTORS(SyncerUtil);
+};
+
+}  // namespace browser_sync
+
+#endif  // SYNC_ENGINE_SYNCER_UTIL_H_