Landing Recent QUIC changes until 10:38 AM, Oct 17, 2016 UTC-4

net/quic/test_tools/quic_test_utils.cc

Index: net/quic/test_tools/quic_test_utils.cc
diff --git a/net/quic/test_tools/quic_test_utils.cc b/net/quic/test_tools/quic_test_utils.cc
index cbc0eb1cd25f950b274fb843b5bc5645162c6eb7..2a6ef34f268548e809c69f3a1f6d76a7dafe0bbf 100644
--- a/net/quic/test_tools/quic_test_utils.cc
+++ b/net/quic/test_tools/quic_test_utils.cc
@@ -98,7 +98,10 @@ QuicPacket* BuildUnsizedDataPacket(QuicFramer* framer,
 }
 
 QuicFlagSaver::QuicFlagSaver() {
-#define QUIC_FLAG(type, flag, value) CHECK_EQ(value, flag);
+#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";
 #include "net/quic/core/quic_flags_list.h"
 #undef QUIC_FLAG
 }