base: Remove the string logging from CHECK().

net/quic/test_tools/quic_test_utils.cc

 // Copyright (c) 2012 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 "net/quic/test_tools/quic_test_utils.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "base/sha1.h"
@@ skipping 66 matching lines @@
   // Re-construct the data packet with data ownership.
   return new QuicPacket(buffer, length, /* owns_buffer */ true,
                         header.public_header.connection_id_length,
                         header.public_header.version_flag,
                         header.public_header.multipath_flag,
                         header.public_header.nonce != nullptr,
                         header.public_header.packet_number_length);
 }
 
 QuicFlagSaver::QuicFlagSaver() {
-#define QUIC_FLAG(type, flag, value)                                          \
-  CHECK_EQ(value, flag) << "Flag set to an expected value.  A prior test is " \
-                           "likely setting a flag "                           \
-                        << "without using a QuicFlagSaver";
+// This checks that |flag| is set to an expected value.  A prior test is
+// likely setting a flag without using a QuicFlagSaver if this fails.
+#define QUIC_FLAG(type, flag, value) CHECK_EQ(value, flag);
 #include "net/quic/core/quic_flags_list.h"
 #undef QUIC_FLAG
 }
 
 QuicFlagSaver::~QuicFlagSaver() {
 #define QUIC_FLAG(type, flag, value) flag = value;
 #include "net/quic/core/quic_flags_list.h"
 #undef QUIC_FLAG
 }
 
@@ skipping 743 matching lines @@
                                 QuicTime::Delta connection_start_time,
                                 QuicVersionVector supported_versions,
                                 MockQuicConnectionHelper* helper,
                                 MockAlarmFactory* alarm_factory,
                                 QuicCryptoClientConfig* crypto_client_config,
                                 PacketSavingConnection** client_connection,
                                 TestQuicSpdyClientSession** client_session) {
   CHECK(crypto_client_config);
   CHECK(client_connection);
   CHECK(client_session);
-  CHECK(!connection_start_time.IsZero())
-      << "Connections must start at non-zero times, otherwise the "
-      << "strike-register will be unhappy.";
+  // Connections must start at non-zero times, otherwise the strike-register
+  // will be unhappy.
+  CHECK(!connection_start_time.IsZero());
 
   QuicConfig config = supports_stateless_rejects
                           ? DefaultQuicConfigStatelessRejects()
                           : DefaultQuicConfig();
   *client_connection = new PacketSavingConnection(
       helper, alarm_factory, Perspective::IS_CLIENT, supported_versions);
   *client_session = new TestQuicSpdyClientSession(
       *client_connection, config, server_id, crypto_client_config);
   (*client_connection)->AdvanceTime(connection_start_time);
 }
 
 void CreateServerSessionForTest(
     QuicServerId server_id,
     QuicTime::Delta connection_start_time,
     QuicVersionVector supported_versions,
     MockQuicConnectionHelper* helper,
     MockAlarmFactory* alarm_factory,
     QuicCryptoServerConfig* server_crypto_config,
     QuicCompressedCertsCache* compressed_certs_cache,
     PacketSavingConnection** server_connection,
     TestQuicSpdyServerSession** server_session) {
   CHECK(server_crypto_config);
   CHECK(server_connection);
   CHECK(server_session);
-  CHECK(!connection_start_time.IsZero())
-      << "Connections must start at non-zero times, otherwise the "
-      << "strike-register will be unhappy.";
+  // Connections must start at non-zero times, otherwise the strike-register
+  // will be unhappy.
+  CHECK(!connection_start_time.IsZero());
 
   *server_connection = new PacketSavingConnection(
       helper, alarm_factory, Perspective::IS_SERVER, supported_versions);
   *server_session = new TestQuicSpdyServerSession(
       *server_connection, DefaultQuicConfig(), server_crypto_config,
       compressed_certs_cache);
 
   // We advance the clock initially because the default time is zero and the
   // strike register worries that we've just overflowed a uint32_t time.
   (*server_connection)->AdvanceTime(connection_start_time);
 }
 
 QuicStreamId QuicClientDataStreamId(int i) {
   return kClientDataStreamId1 + 2 * i;
 }
 
 }  // namespace test
 }  // namespace net