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

content/browser/devtools/devtools_io_context.cc

Index: content/browser/devtools/devtools_io_context.cc
diff --git a/content/browser/devtools/devtools_io_context.cc b/content/browser/devtools/devtools_io_context.cc
index 719ef4263e6b7ed2e8dd05d85f508d6e035997c7..a14a8f63199ea89ad836e9462c249a190114105c 100644
--- a/content/browser/devtools/devtools_io_context.cc
+++ b/content/browser/devtools/devtools_io_context.cc
@@ -20,20 +20,18 @@ namespace {
 unsigned s_last_stream_handle = 0;
 }
 
-using Stream = DevToolsIOContext::Stream;
-
-Stream::Stream(base::SequencedTaskRunner* task_runner)
+DevToolsIOContext::Stream::Stream(base::SequencedTaskRunner* task_runner)
     : base::RefCountedDeleteOnSequence<Stream>(task_runner),
       handle_(base::UintToString(++s_last_stream_handle)),
       task_runner_(task_runner),
       had_errors_(false),
       last_read_pos_(0) {}
 
-Stream::~Stream() {
+DevToolsIOContext::Stream::~Stream() {
   DCHECK(task_runner_->RunsTasksInCurrentSequence());
 }
 
-bool Stream::InitOnFileSequenceIfNeeded() {
+bool DevToolsIOContext::Stream::InitOnFileSequenceIfNeeded() {
   DCHECK(task_runner_->RunsTasksInCurrentSequence());
   base::ThreadRestrictions::AssertIOAllowed();
   if (had_errors_)
@@ -60,19 +58,19 @@ bool Stream::InitOnFileSequenceIfNeeded() {
   return true;
 }
 
-void Stream::Read(off_t position, size_t max_size, ReadCallback callback) {
+void DevToolsIOContext::Stream::Read(off_t position, size_t max_size, ReadCallback callback) {
   task_runner_->PostTask(
       FROM_HERE, base::BindOnce(&Stream::ReadOnFileSequence, this, position,
                                 max_size, std::move(callback)));
 }
 
-void Stream::Append(std::unique_ptr<std::string> data) {
+void DevToolsIOContext::Stream::Append(std::unique_ptr<std::string> data) {
   task_runner_->PostTask(
       FROM_HERE,
       base::BindOnce(&Stream::AppendOnFileSequence, this, std::move(data)));
 }
 
-void Stream::ReadOnFileSequence(off_t position,
+void DevToolsIOContext::Stream::ReadOnFileSequence(off_t position,
                                 size_t max_size,
                                 ReadCallback callback) {
   DCHECK(task_runner_->RunsTasksInCurrentSequence());
@@ -108,7 +106,7 @@ void Stream::ReadOnFileSequence(off_t position,
       base::BindOnce(std::move(callback), std::move(data), status));
 }
 
-void Stream::AppendOnFileSequence(std::unique_ptr<std::string> data) {
+void DevToolsIOContext::Stream::AppendOnFileSequence(std::unique_ptr<std::string> data) {
   if (!InitOnFileSequenceIfNeeded())
     return;
   int size_written = file_.WriteAtCurrentPos(&*data->begin(), data->length());
@@ -123,19 +121,19 @@ DevToolsIOContext::DevToolsIOContext() = default;
 
 DevToolsIOContext::~DevToolsIOContext() = default;
 
-scoped_refptr<Stream> DevToolsIOContext::CreateTempFileBackedStream() {
+scoped_refptr<DevToolsIOContext::Stream> DevToolsIOContext::CreateTempFileBackedStream() {
   if (!task_runner_) {
     task_runner_ = base::CreateSequencedTaskRunnerWithTraits(
         {base::MayBlock(), base::TaskPriority::BACKGROUND});
   }
-  scoped_refptr<Stream> result = new Stream(task_runner_.get());
+  scoped_refptr<DevToolsIOContext::Stream> result = new DevToolsIOContext::Stream(task_runner_.get());
   bool inserted =
       streams_.insert(std::make_pair(result->handle(), result)).second;
   DCHECK(inserted);
   return result;
 }
 
-scoped_refptr<Stream>
+scoped_refptr<DevToolsIOContext::Stream>
     DevToolsIOContext::GetByHandle(const std::string& handle) {
   StreamsMap::const_iterator it = streams_.find(handle);
   return it == streams_.end() ? scoped_refptr<Stream>() : it->second;