Landing Recent QUIC changes until 01/26/2016 18:14 UTC

net/quic/quic_one_block_arena_test.cc

Index: net/quic/quic_one_block_arena_test.cc
diff --git a/net/quic/quic_one_block_arena_test.cc b/net/quic/quic_one_block_arena_test.cc
index 0b5024865aaf9ca9b8f775f2cc03d35075cc55c2..39e7767c3567c5318884cae984fb794378993829 100644
--- a/net/quic/quic_one_block_arena_test.cc
+++ b/net/quic/quic_one_block_arena_test.cc
@@ -21,21 +21,12 @@ struct TestObject {
 };
 
 TEST(QuicOneBlockArenaTest, AllocateSuccess) {
-  FLAGS_quic_enable_arena_allocation = true;
   QuicOneBlockArena<1024> arena;
   QuicArenaScopedPtr<TestObject> ptr = arena.New<TestObject>();
   EXPECT_TRUE(ptr.is_from_arena());
 }
 
-TEST(QuicOneBlockArenaTest, Disabled) {
-  FLAGS_quic_enable_arena_allocation = false;
-  QuicOneBlockArena<1024> arena;
-  QuicArenaScopedPtr<TestObject> ptr = arena.New<TestObject>();
-  EXPECT_FALSE(ptr.is_from_arena());
-}
-
 TEST(QuicOneBlockArenaTest, Exhaust) {
-  FLAGS_quic_enable_arena_allocation = true;
   QuicOneBlockArena<1024> arena;
   for (size_t i = 0; i < 1024 / kMaxAlign; ++i) {
     QuicArenaScopedPtr<TestObject> ptr = arena.New<TestObject>();
@@ -48,7 +39,6 @@ TEST(QuicOneBlockArenaTest, Exhaust) {
 }
 
 TEST(QuicOneBlockArenaTest, NoOverlaps) {
-  FLAGS_quic_enable_arena_allocation = true;
   QuicOneBlockArena<1024> arena;
   std::vector<QuicArenaScopedPtr<TestObject>> objects;
   IntervalSet<uintptr_t> used;