Sync FakeServer cleanup: CHECKs and logging info

sync/test/fake_server/unique_client_entity.cc

Index: sync/test/fake_server/unique_client_entity.cc
diff --git a/sync/test/fake_server/unique_client_entity.cc b/sync/test/fake_server/unique_client_entity.cc
index 693b24a2c89b143f48a6db298b350e61614c1bf2..864a8c317418da80c2bbfbe496641903dc9c5249 100644
--- a/sync/test/fake_server/unique_client_entity.cc
+++ b/sync/test/fake_server/unique_client_entity.cc
@@ -23,9 +23,8 @@ UniqueClientEntity::~UniqueClientEntity() { }
 // static
 FakeServerEntity* UniqueClientEntity::CreateNew(
     const sync_pb::SyncEntity& client_entity) {
-  DCHECK(client_entity.has_client_defined_unique_tag());
-  DCHECK(!client_entity.folder());
-  DCHECK(!client_entity.deleted());
+  CHECK(client_entity.has_client_defined_unique_tag())
+      << "A UniqueClientEntity must have a client-defined unique tag.";
   ModelType model_type =
       syncer::GetModelTypeFromSpecifics(client_entity.specifics());
   string id = client_entity.version() == 0 ?
@@ -46,6 +45,8 @@ FakeServerEntity* UniqueClientEntity::CreateNew(
 FakeServerEntity* UniqueClientEntity::CreateUpdatedVersion(
     const sync_pb::SyncEntity& client_entity,
     FakeServerEntity* current_server_entity) {
+  CHECK(current_server_entity != NULL) << "An existing server entity must be "

[rlarocque, 2014/06/09 21:28:48]

I think the "!= NULL" is redundant here.

[pval...(no longer on Chromium), 2014/06/09 23:29:27]

removed per the top-level comment

+                                       << "provided.";
   return new UniqueClientEntity(client_entity.id_string(),
                                 current_server_entity->GetModelType(),
                                 client_entity.version(),