Snapshot of all changes to get jumbo in blink and content.

net/quic/quartc/quartc_session.cc

Index: net/quic/quartc/quartc_session.cc
diff --git a/net/quic/quartc/quartc_session.cc b/net/quic/quartc/quartc_session.cc
index 7e5c5af676a460c119411b6db2c0eb845f3d08f0..ea1d8869eccc0e336124d9972679ff0a76349a04 100644
--- a/net/quic/quartc/quartc_session.cc
+++ b/net/quic/quartc/quartc_session.cc
@@ -14,7 +14,7 @@ namespace {
 
 // Default priority for incoming QUIC streams.
 // TODO(zhihuang): Determine if this value is correct.
-static const SpdyPriority kDefaultPriority = 3;
+static const SpdyPriority kDefaultSpdyPriority = 3;
 
 // Arbitrary server port number for net::QuicCryptoClientConfig.
 const int kQuicServerPort = 0;
@@ -237,7 +237,7 @@ bool QuartcSession::ExportKeyingMaterial(const string& label,
 QuartcStreamInterface* QuartcSession::CreateOutgoingStream(
     const OutgoingStreamParameters& param) {
   // The |param| is for forward-compatibility. Not used for now.
-  return CreateOutgoingDynamicStream(kDefaultPriority);
+  return CreateOutgoingDynamicStream(kDefaultSpdyPriority);
 }
 
 void QuartcSession::SetDelegate(
@@ -283,11 +283,11 @@ void QuartcSession::SetServerCryptoConfig(
 }
 
 QuicStream* QuartcSession::CreateIncomingDynamicStream(QuicStreamId id) {
-  return ActivateDataStream(CreateDataStream(id, kDefaultPriority));
+  return ActivateDataStream(CreateDataStream(id, kDefaultSpdyPriority));
 }
 
 std::unique_ptr<QuicStream> QuartcSession::CreateStream(QuicStreamId id) {
-  return CreateDataStream(id, kDefaultPriority);
+  return CreateDataStream(id, kDefaultSpdyPriority);
 }
 
 std::unique_ptr<QuartcStream> QuartcSession::CreateDataStream(