base: Remove the string logging from CHECK().

components/sync/engine_impl/get_commit_ids.cc

 // Copyright 2013 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/get_commit_ids.h"
 
 #include <set>
 
 #include "base/macros.h"
 #include "components/sync/base/cryptographer.h"
@@ skipping 132 matching lines @@
     // New clients (following the resolution of crbug.com/125381) should not
     // create such items.  Old clients may have left some in the database
     // (crbug.com/132905), but we should now be cleaning them on startup.
     NOTREACHED() << "Found deleted and unsynced local item: " << entry;
     return false;
   }
 
   // Extra validity checks.
   syncable::Id id = entry.GetId();
   if (id == entry.GetParentId()) {
-    CHECK(id.IsRoot()) << "Non-root item is self parenting." << entry;
+    // Non-root item is self parenting.|entry|.
+    CHECK(id.IsRoot());
     // If the root becomes unsynced it can cause us problems.
     NOTREACHED() << "Root item became unsynced " << entry;
     return false;
   }
 
   if (entry.IsRoot()) {
     NOTREACHED() << "Permanent item became unsynced " << entry;
     return false;
   }
 
@@ skipping 20 matching lines @@
     const std::vector<int64_t>& deleted_conflicted_items,
     std::set<int64_t>* ready_unsynced_set) {
   for (auto iter = deleted_conflicted_items.begin();
        iter != deleted_conflicted_items.end(); ++iter) {
     syncable::Entry item(trans, syncable::GET_BY_HANDLE, *iter);
     syncable::Id parent_id = item.GetParentId();
     DCHECK(!parent_id.IsNull());
 
     while (!parent_id.IsRoot()) {
       syncable::Entry parent(trans, syncable::GET_BY_ID, parent_id);
-      CHECK(parent.good()) << "Bad user-only parent in item path.";
+      // Bad user-only parent in item path.
+      CHECK(parent.good());
       int64_t handle = parent.GetMetahandle();
 
       if (!parent.GetIsDel())
         break;
 
       auto ready_iter = ready_unsynced_set->find(handle);
       if (ready_iter == ready_unsynced_set->end())
         break;
 
       // Remove this entry from |ready_unsynced_set|.
@@ skipping 154 matching lines @@
     const std::set<int64_t>& ready_unsynced_set,
     const syncable::Entry& item,
     syncable::Directory::Metahandles* result) const {
   DCHECK(SupportsHierarchy(item));
   syncable::Directory::Metahandles dependencies;
   syncable::Id parent_id = item.GetParentId();
 
   // Climb the tree adding entries leaf -> root.
   while (!parent_id.ServerKnows()) {
     syncable::Entry parent(trans_, syncable::GET_BY_ID, parent_id);
-    CHECK(parent.good()) << "Bad user-only parent in item path.";
+    // Bad user-only parent in item path.
+    CHECK(parent.good());
     int64_t handle = parent.GetMetahandle();
     if (HaveItem(handle)) {
       // We've already added this parent (and therefore all of its parents).
       // We can return early.
       break;
     }
 
     if (!TryAddItem(ready_unsynced_set, parent, &dependencies)) {
       // The parent isn't in |ready_unsynced_set|.
       break;
@@ skipping 187 matching lines @@
   // Add moves and creates, and prepend their uncommitted parents.
   traversal.AddCreatesAndMoves(ready_unsynced_set);
 
   // Add all deletes.
   traversal.AddDeletes(ready_unsynced_set);
 }
 
 }  // namespace
 
 }  // namespace syncer