base: Remove the string logging from CHECK().

components/sync/engine_impl/loopback_server/persistent_bookmark_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/engine_impl/loopback_server/persistent_bookmark_entity.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
@@ skipping 16 matching lines @@
 
 }  // namespace
 
 PersistentBookmarkEntity::~PersistentBookmarkEntity() {}
 
 // static
 std::unique_ptr<LoopbackServerEntity> PersistentBookmarkEntity::CreateNew(
     const sync_pb::SyncEntity& client_entity,
     const string& parent_id,
     const string& client_guid) {
-  CHECK(client_entity.version() == 0) << "New entities must have version = 0.";
-  CHECK(IsBookmark(client_entity)) << "The given entity must be a bookmark.";
+  // New entities must have version = 0.
+  CHECK_EQ(client_entity.version(), 0);
+  // The given entity must be a bookmark.
+  CHECK(IsBookmark(client_entity));
 
   const string id =
       LoopbackServerEntity::CreateId(syncer::BOOKMARKS, base::GenerateGUID());
   const string originator_cache_guid = client_guid;
   const string originator_client_item_id = client_entity.id_string();
 
   return std::unique_ptr<LoopbackServerEntity>(new PersistentBookmarkEntity(
       id, 0, client_entity.name(), originator_cache_guid,
       originator_client_item_id, client_entity.unique_position(),
       client_entity.specifics(), client_entity.folder(), parent_id,
       client_entity.ctime(), client_entity.mtime()));
 }
 
 // static
 std::unique_ptr<LoopbackServerEntity>
 PersistentBookmarkEntity::CreateUpdatedVersion(
     const sync_pb::SyncEntity& client_entity,
     const LoopbackServerEntity& current_server_entity,
     const string& parent_id) {
-  CHECK(client_entity.version() != 0) << "Existing entities must not have a "
-                                      << "version = 0.";
-  CHECK(IsBookmark(client_entity)) << "The given entity must be a bookmark.";
+  // Existing entities must not have a version = 0.
+  CHECK_NE(client_entity.version(), 0);
+  // The given entity must be a bookmark.
+  CHECK(IsBookmark(client_entity));
 
   const PersistentBookmarkEntity& current_bookmark_entity =
       static_cast<const PersistentBookmarkEntity&>(current_server_entity);
   const string originator_cache_guid =
       current_bookmark_entity.originator_cache_guid_;
   const string originator_client_item_id =
       current_bookmark_entity.originator_client_item_id_;
 
   return std::unique_ptr<LoopbackServerEntity>(new PersistentBookmarkEntity(
       client_entity.id_string(), 0, client_entity.name(), originator_cache_guid,
       originator_client_item_id, client_entity.unique_position(),
       client_entity.specifics(), client_entity.folder(), parent_id,
       client_entity.ctime(), client_entity.mtime()));
 }
 
 // static
 std::unique_ptr<LoopbackServerEntity>
 PersistentBookmarkEntity::CreateFromEntity(
     const sync_pb::SyncEntity& client_entity) {
-  CHECK(IsBookmark(client_entity)) << "The given entity must be a bookmark.";
+  // The given entity must be a bookmark.
+  CHECK(IsBookmark(client_entity));
 
   return std::unique_ptr<LoopbackServerEntity>(new PersistentBookmarkEntity(
       client_entity.id_string(), client_entity.version(), client_entity.name(),
       client_entity.originator_cache_guid(),
       client_entity.originator_client_item_id(),
       client_entity.unique_position(), client_entity.specifics(),
       client_entity.folder(), client_entity.parent_id_string(),
       client_entity.ctime(), client_entity.mtime()));
 }
 PersistentBookmarkEntity::PersistentBookmarkEntity(
@@ skipping 49 matching lines @@
 
   sync_pb::UniquePosition* unique_position = proto->mutable_unique_position();
   unique_position->CopyFrom(unique_position_);
 }
 
 bool PersistentBookmarkEntity::IsFolder() const {
   return is_folder_;
 }
 
 }  // namespace syncer