[Sync] Move nigori_util* to sync/syncable

It's already in the syncable namespace, so syncable/ seems like
a better place for it.

Move a function from syncer_util.h. to syncable_util.h.

Remove pseudo-namespace class SyncerUtil.

After this change, everything in sync/engine will be in the syncer
namespace.

Also clean up some whitespace.

BUG=128060
TEST=


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

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

1 files changed, 3 insertions, 3 deletions

diff --git a/sync/engine/verify_updates_command.cc b/sync/engine/verify_updates_command.cc
index 93b6263..abb3db8 100644
--- a/sync/engine/verify_updates_command.cc
+++ b/sync/engine/verify_updates_command.cc
@@ -47,7 +47,7 @@ namespace {
 // that both clients will refer to the item using the same ID going forward.  In
 // this case, we're right to assume that the update is not a reflection.
 //
-// For more information, see SyncerUtil::FindLocalIdToUpdate().
+// For more information, see FindLocalIdToUpdate().
 bool UpdateContainsNewVersion(syncable::BaseTransaction *trans,
                               const SyncEntity &update) {
   int64 existing_version = -1; // The server always sends positive versions.
@@ -150,7 +150,7 @@ VerifyUpdatesCommand::VerifyUpdateResult VerifyUpdatesCommand::VerifyUpdate(
   }
 
   syncable::MutableEntry same_id(trans, GET_BY_ID, id);
-  result.value = SyncerUtil::VerifyNewEntry(entry, &same_id, deleted);
+  result.value = VerifyNewEntry(entry, &same_id, deleted);
 
   syncable::ModelType placement_type = !deleted ? entry.GetModelType()
       : same_id.good() ? same_id.GetModelType() : syncable::UNSPECIFIED;
@@ -176,7 +176,7 @@ VerifyUpdatesCommand::VerifyUpdateResult VerifyUpdatesCommand::VerifyUpdate(
   // If we have an existing entry, we check here for updates that break
   // consistency rules.
   if (VERIFY_UNDECIDED == result.value) {
-    result.value = SyncerUtil::VerifyUpdateConsistency(trans, entry, &same_id,
+    result.value = VerifyUpdateConsistency(trans, entry, &same_id,
         deleted, is_directory, model_type);
   }