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

net/filter/filter_source_stream.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/filter/filter_source_stream.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_util.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 
 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";
 
 const size_t kBufferSize = 32 * 1024;
 
 }  // namespace
 
 FilterSourceStream::FilterSourceStream(SourceType type,
                                        std::unique_ptr<SourceStream> upstream)
     : SourceStream(type),
@@ skipping 39 matching lines @@
     return GetTypeAsString();
   return next_type_string + "," + GetTypeAsString();
 }
 
 FilterSourceStream::SourceType FilterSourceStream::ParseEncodingType(
     const std::string& encoding) {
   if (encoding.empty()) {
     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;
   }
 }
 
 void FilterSourceStream::ReportContentDecodingFailed(SourceType type) {
   UMA_HISTOGRAM_ENUMERATION("Net.ContentDecodingFailed2", type, TYPE_MAX);
 }
 
@@ skipping 96 matching lines @@
   output_buffer_size_ = 0;
 
   base::ResetAndReturn(&callback_).Run(rv);
 }
 
 bool FilterSourceStream::NeedMoreData() const {
   return !upstream_end_reached_;
 }
 
 }  // namespace net