Landing Recent QUIC changes until Sat Sep 10 00:32:41

net/quic/core/quic_alarm.cc

Index: net/quic/core/quic_alarm.cc
diff --git a/net/quic/core/quic_alarm.cc b/net/quic/core/quic_alarm.cc
index 15bde886e1781e606e76e3e7e63ccf672d4323f8..985be648f666fd5f23e6f7b07fa1bd03ffef14d5 100644
--- a/net/quic/core/quic_alarm.cc
+++ b/net/quic/core/quic_alarm.cc
@@ -39,17 +39,12 @@ void QuicAlarm::Update(QuicTime new_deadline, QuicTime::Delta granularity) {
       granularity.ToMicroseconds()) {
     return;
   }
-  if (FLAGS_quic_change_alarms_efficiently) {
-    const bool was_set = IsSet();
-    deadline_ = new_deadline;
-    if (was_set) {
-      UpdateImpl();
-    } else {
-      SetImpl();
-    }
+  const bool was_set = IsSet();
+  deadline_ = new_deadline;
+  if (was_set) {
+    UpdateImpl();
   } else {
-    Cancel();
-    Set(new_deadline);
+    SetImpl();
   }
 }