Sync FakeServer cleanup: CHECKs and logging info

sync/test/fake_server/unique_client_entity.cc

 // Copyright 2014 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.
 
 #include "sync/test/fake_server/unique_client_entity.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/guid.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/test/fake_server/fake_server_entity.h"
 
 using std::string;
 
 using syncer::ModelType;
 
 namespace fake_server {
 
 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 ?
       FakeServerEntity::CreateId(model_type, base::GenerateGUID()) :
       client_entity.id_string();
   return new UniqueClientEntity(id,
                                 model_type,
                                 client_entity.version(),
                                 client_entity.name(),
                                 client_entity.parent_id_string(),
                                 client_entity.client_defined_unique_tag(),
                                 client_entity.specifics(),
                                 client_entity.ctime(),
                                 client_entity.mtime());
 }
 
 // static
 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(),
                                 client_entity.name(),
                                 client_entity.parent_id_string(),
                                 client_entity.client_defined_unique_tag(),
                                 client_entity.specifics(),
                                 client_entity.ctime(),
                                 client_entity.mtime());
 }
@@ skipping 38 matching lines @@
 
 bool UniqueClientEntity::IsDeleted() const {
   return false;
 }
 
 bool UniqueClientEntity::IsFolder() const {
   return false;
 }
 
 }  // namespace fake_server