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

net/filter/filter_source_stream.cc

Index: net/filter/filter_source_stream.cc
diff --git a/net/filter/filter_source_stream.cc b/net/filter/filter_source_stream.cc
index 688d6927055527a93411913a7a7a299f129bedb4..de697285ca383402b7ac793056a8d5402a8c0f81 100644
--- a/net/filter/filter_source_stream.cc
+++ b/net/filter/filter_source_stream.cc
@@ -17,9 +17,9 @@ namespace net {
 
 namespace {
 
-const char kDeflate[] = "deflate";
+const char kDeflate2[] = "deflate";
 const char kGZip[] = "gzip";
-const char kSdch[] = "sdch";
+const char kSdch2[] = "sdch";
 const char kXGZip[] = "x-gzip";
 const char kBrotli[] = "br";
 
@@ -79,12 +79,12 @@ FilterSourceStream::SourceType FilterSourceStream::ParseEncodingType(
     return TYPE_NONE;
   } else if (base::LowerCaseEqualsASCII(encoding, kBrotli)) {
     return TYPE_BROTLI;
-  } else if (base::LowerCaseEqualsASCII(encoding, kDeflate)) {
+  } else if (base::LowerCaseEqualsASCII(encoding, kDeflate2)) {
     return TYPE_DEFLATE;
   } else if (base::LowerCaseEqualsASCII(encoding, kGZip) ||
              base::LowerCaseEqualsASCII(encoding, kXGZip)) {
     return TYPE_GZIP;
-  } else if (base::LowerCaseEqualsASCII(encoding, kSdch)) {
+  } else if (base::LowerCaseEqualsASCII(encoding, kSdch2)) {
     return TYPE_SDCH;
   } else {
     return TYPE_UNKNOWN;