Landing Recent QUIC changes until 4AM, Aug 7, 2016 UTC-4

net/quic/core/congestion_control/tcp_cubic_sender_base.cc

Index: net/quic/core/congestion_control/tcp_cubic_sender_base.cc
diff --git a/net/quic/core/congestion_control/tcp_cubic_sender_base.cc b/net/quic/core/congestion_control/tcp_cubic_sender_base.cc
index caa02ebf92130797d2b0d29fcb8980c1a9d79395..6d248206dd3455d33dbb77f98f21d0571808c005 100644
--- a/net/quic/core/congestion_control/tcp_cubic_sender_base.cc
+++ b/net/quic/core/congestion_control/tcp_cubic_sender_base.cc
@@ -5,6 +5,7 @@
 #include "net/quic/core/congestion_control/tcp_cubic_sender_base.h"
 
 #include <algorithm>
+#include <string>
 
 #include "base/metrics/histogram_macros.h"
 #include "net/quic/core/congestion_control/prr_sender.h"
@@ -283,4 +284,10 @@ void TcpCubicSenderBase::OnConnectionMigration() {
   last_cutback_exited_slowstart_ = false;
 }
 
+std::string TcpCubicSenderBase::GetDebugState() const {
+  return "";
+}
+
+void TcpCubicSenderBase::OnApplicationLimited(QuicByteCount bytes_in_flight) {}
+
 }  // namespace net