Landing Recent QUIC changes until Sat Aug 13 04:32:36 2016 UTC-0

net/quic/core/quic_one_block_arena_test.cc

Index: net/quic/core/quic_one_block_arena_test.cc
diff --git a/net/quic/core/quic_one_block_arena_test.cc b/net/quic/core/quic_one_block_arena_test.cc
index 3f636327779673ee43d9408f882e73c432aaffe9..15ff0c672116449ff80b046f22ae17bbd5ed3d58 100644
--- a/net/quic/core/quic_one_block_arena_test.cc
+++ b/net/quic/core/quic_one_block_arena_test.cc
@@ -7,6 +7,7 @@
 #include "net/quic/core/interval_set.h"
 #include "net/quic/core/quic_flags.h"
 #include "net/quic/core/quic_utils.h"
+#include "net/quic/test_tools/quic_test_utils.h"
 #include "net/test/gtest_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -33,8 +34,8 @@ TEST(QuicOneBlockArenaTest, Exhaust) {
     EXPECT_TRUE(ptr.is_from_arena());
   }
   QuicArenaScopedPtr<TestObject> ptr;
-  EXPECT_DFATAL(ptr = arena.New<TestObject>(),
-                "Ran out of space in QuicOneBlockArena");
+  EXPECT_QUIC_BUG(ptr = arena.New<TestObject>(),
+                  "Ran out of space in QuicOneBlockArena");
   EXPECT_FALSE(ptr.is_from_arena());
 }