base: Remove the string logging from CHECK().

components/sync/test/fake_server/permanent_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 "components/sync/test/fake_server/permanent_entity.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 
 using std::string;
 using syncer::ModelType;
 
 // The parent tag for children of the root entity. Entities with this parent are
 // referred to as top level enities.
 static const char kRootParentTag[] = "0";
 
 namespace fake_server {
 
 PermanentEntity::~PermanentEntity() {}
 
 // static
 std::unique_ptr<FakeServerEntity> PermanentEntity::Create(
     const ModelType& model_type,
     const string& server_tag,
     const string& name,
     const string& parent_server_tag) {
-  CHECK(model_type != syncer::UNSPECIFIED) << "The entity's ModelType is "
-                                           << "invalid.";
-  CHECK(!server_tag.empty()) << "A PermanentEntity must have a server tag.";
-  CHECK(!name.empty()) << "The entity must have a non-empty name.";
-  CHECK(!parent_server_tag.empty()) << "A PermanentEntity must have a parent "
-                                    << "server tag.";
-  CHECK(parent_server_tag != kRootParentTag) << "Top-level entities should not "
-                                             << "be created with this factory.";
+  // The entity's ModelType is invalid.
+  CHECK(model_type != syncer::UNSPECIFIED);
+  // A PermanentEntity must have a server tag.
+  CHECK(!server_tag.empty());
+  // The entity must have a non-empty name.
+  CHECK(!name.empty());
+  // A PermanentEntity must have a parent server tag.
+  CHECK(!parent_server_tag.empty());
+  // Top-level entities should not be created with this factory.
+  CHECK(parent_server_tag != kRootParentTag);
 
   string id = FakeServerEntity::CreateId(model_type, server_tag);
   string parent_id = FakeServerEntity::CreateId(model_type, parent_server_tag);
   sync_pb::EntitySpecifics entity_specifics;
   AddDefaultFieldValue(model_type, &entity_specifics);
   return std::unique_ptr<FakeServerEntity>(new PermanentEntity(
       id, model_type, name, parent_id, server_tag, entity_specifics));
 }
 
 // static
 std::unique_ptr<FakeServerEntity> PermanentEntity::CreateTopLevel(
     const ModelType& model_type) {
-  CHECK(model_type != syncer::UNSPECIFIED) << "The entity's ModelType is "
-                                           << "invalid.";
+  // The entity's ModelType is invalid.
+  CHECK(model_type != syncer::UNSPECIFIED);
   string server_tag = syncer::ModelTypeToRootTag(model_type);
   string name = syncer::ModelTypeToString(model_type);
   string id = FakeServerEntity::GetTopLevelId(model_type);
   sync_pb::EntitySpecifics entity_specifics;
   AddDefaultFieldValue(model_type, &entity_specifics);
   return std::unique_ptr<FakeServerEntity>(new PermanentEntity(
       id, model_type, name, kRootParentTag, server_tag, entity_specifics));
 }
 
 // static
 std::unique_ptr<FakeServerEntity> PermanentEntity::CreateUpdatedNigoriEntity(
     const sync_pb::SyncEntity& client_entity,
     const FakeServerEntity& current_server_entity) {
   ModelType model_type = current_server_entity.model_type();
-  CHECK(model_type == syncer::NIGORI) << "This factory only supports NIGORI "
-                                      << "entities.";
+  // This factory only supports NIGORI entities.
+  CHECK(model_type == syncer::NIGORI);
 
   return base::WrapUnique<FakeServerEntity>(new PermanentEntity(
       current_server_entity.id(), model_type, current_server_entity.GetName(),
       current_server_entity.GetParentId(),
       syncer::ModelTypeToRootTag(model_type), client_entity.specifics()));
 }
 
 PermanentEntity::PermanentEntity(const string& id,
                                  const ModelType& model_type,
                                  const string& name,
@@ skipping 21 matching lines @@
 
 bool PermanentEntity::IsFolder() const {
   return true;
 }
 
 bool PermanentEntity::IsPermanent() const {
   return true;
 }
 
 }  // namespace fake_server