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

content/browser/loader/mime_sniffing_resource_handler.cc

 // Copyright (c) 2012 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 "content/browser/loader/mime_sniffing_resource_handler.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 35 matching lines @@
 
 const char kAcceptHeader[] = "Accept";
 const char kFrameAcceptHeader[] =
     "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,"
     "image/apng,*/*;q=0.8";
 const char kStylesheetAcceptHeader[] = "text/css,*/*;q=0.1";
 const char kImageAcceptHeader[] = "image/webp,image/apng,image/*,*/*;q=0.8";
 const char kDefaultAcceptHeader[] = "*/*";
 
 // Used to write into an existing IOBuffer at a given offset.
-class DependentIOBuffer : public net::WrappedIOBuffer {
+class DependentIOBufferBar : public net::WrappedIOBuffer {
  public:
-  DependentIOBuffer(net::IOBuffer* buf, int offset)
+  DependentIOBufferBar(net::IOBuffer* buf, int offset)
       : net::WrappedIOBuffer(buf->data() + offset), buf_(buf) {}
 
  private:
-  ~DependentIOBuffer() override {}
+  ~DependentIOBufferBar() override {}
 
   scoped_refptr<net::IOBuffer> buf_;
 };
 
 }  // namespace
 
 class MimeSniffingResourceHandler::Controller : public ResourceController {
  public:
   explicit Controller(MimeSniffingResourceHandler* mime_handler)
       : mime_handler_(mime_handler) {}
@@ skipping 155 matching lines @@
 
   if (state_ == STATE_STREAMING) {
     next_handler_->OnWillRead(buf, buf_size, std::move(controller));
     return;
   }
 
   DCHECK_EQ(State::STATE_BUFFERING, state_);
 
   if (read_buffer_.get()) {
     CHECK_LT(bytes_read_, read_buffer_size_);
-    *buf = new DependentIOBuffer(read_buffer_.get(), bytes_read_);
+    *buf = new DependentIOBufferBar(read_buffer_.get(), bytes_read_);
     *buf_size = read_buffer_size_ - bytes_read_;
     controller->Resume();
     return;
   }
 
   DCHECK(!read_buffer_size_);
 
   parent_read_buffer_ = buf;
   parent_read_buffer_size_ = buf_size;
 
@@ skipping 354 matching lines @@
 
 void MimeSniffingResourceHandler::OnPluginsLoaded(
     const std::vector<WebPluginInfo>& plugins) {
   // No longer blocking on the plugins being loaded.
   request()->LogUnblocked();
   if (state_ == STATE_BUFFERING)
     AdvanceState();
 }
 
 }  // namespace content