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

net/dns/dns_query.cc

Index: net/dns/dns_query.cc
diff --git a/net/dns/dns_query.cc b/net/dns/dns_query.cc
index ac74ca479615a31abd407cd12ca2572b126637b0..35ce65bcd0ce2d254ca44c1ec273bc1cdbbc7413 100644
--- a/net/dns/dns_query.cc
+++ b/net/dns/dns_query.cc
@@ -15,7 +15,7 @@ namespace net {
 
 namespace {
 
-const size_t kHeaderSize = sizeof(dns_protocol::Header);
+const size_t kHeaderSize2 = sizeof(dns_protocol::Header);
 
 }  // namespace
 
@@ -25,7 +25,7 @@ const size_t kHeaderSize = sizeof(dns_protocol::Header);
 // the QDCOUNT to 1, meaning the question section has a single entry.
 DnsQuery::DnsQuery(uint16_t id, const base::StringPiece& qname, uint16_t qtype)
     : qname_size_(qname.size()),
-      io_buffer_(new IOBufferWithSize(kHeaderSize + question_size())),
+      io_buffer_(new IOBufferWithSize(kHeaderSize2 + question_size())),
       header_(reinterpret_cast<dns_protocol::Header*>(io_buffer_->data())) {
   DCHECK(!DNSDomainToString(qname).empty());
   *header_ = {};
@@ -34,7 +34,7 @@ DnsQuery::DnsQuery(uint16_t id, const base::StringPiece& qname, uint16_t qtype)
   header_->qdcount = base::HostToNet16(1);
 
   // Write question section after the header.
-  base::BigEndianWriter writer(io_buffer_->data() + kHeaderSize,
+  base::BigEndianWriter writer(io_buffer_->data() + kHeaderSize2,
                                question_size());
   writer.WriteBytes(qname.data(), qname.size());
   writer.WriteU16(qtype);
@@ -53,18 +53,18 @@ uint16_t DnsQuery::id() const {
 }
 
 base::StringPiece DnsQuery::qname() const {
-  return base::StringPiece(io_buffer_->data() + kHeaderSize, qname_size_);
+  return base::StringPiece(io_buffer_->data() + kHeaderSize2, qname_size_);
 }
 
 uint16_t DnsQuery::qtype() const {
   uint16_t type;
-  base::ReadBigEndian<uint16_t>(io_buffer_->data() + kHeaderSize + qname_size_,
+  base::ReadBigEndian<uint16_t>(io_buffer_->data() + kHeaderSize2 + qname_size_,
                                 &type);
   return type;
 }
 
 base::StringPiece DnsQuery::question() const {
-  return base::StringPiece(io_buffer_->data() + kHeaderSize, question_size());
+  return base::StringPiece(io_buffer_->data() + kHeaderSize2, question_size());
 }
 
 void DnsQuery::set_flags(uint16_t flags) {