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

content/child/child_thread_impl.cc

Index: content/child/child_thread_impl.cc
diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
index 034e50cb9d9036bb385f1a2e9a7a02360e67b4a3..b19a133b46622bf367cf05671f0ead660d1d5f50 100644
--- a/content/child/child_thread_impl.cc
+++ b/content/child/child_thread_impl.cc
@@ -100,7 +100,7 @@ namespace {
 const int kConnectionTimeoutS = 15;
 
 base::LazyInstance<base::ThreadLocalPointer<ChildThreadImpl>>::DestructorAtExit
-    g_lazy_tls = LAZY_INSTANCE_INITIALIZER;
+    g_lazy_child_tls = LAZY_INSTANCE_INITIALIZER;
 
 // This isn't needed on Windows because there the sandbox's job object
 // terminates child processes automatically. For unsandboxed processes (i.e.
@@ -432,7 +432,7 @@ void ChildThreadImpl::ConnectChannel(
 }
 
 void ChildThreadImpl::Init(const Options& options) {
-  g_lazy_tls.Pointer()->Set(this);
+  g_lazy_child_tls.Pointer()->Set(this);
   on_channel_error_called_ = false;
   message_loop_ = base::MessageLoop::current();
 #if BUILDFLAG(IPC_MESSAGE_LOG_ENABLED)
@@ -625,7 +625,7 @@ ChildThreadImpl::~ChildThreadImpl() {
   // automatically.  We used to watch the object handle on Windows to do this,
   // but it wasn't possible to do so on POSIX.
   channel_->ClearIPCTaskRunner();
-  g_lazy_tls.Pointer()->Set(NULL);
+  g_lazy_child_tls.Pointer()->Set(NULL);
 }
 
 void ChildThreadImpl::Shutdown() {
@@ -819,7 +819,7 @@ void ChildThreadImpl::OnSetIPCLoggingEnabled(bool enable) {
 #endif  //  IPC_MESSAGE_LOG_ENABLED
 
 ChildThreadImpl* ChildThreadImpl::current() {
-  return g_lazy_tls.Pointer()->Get();
+  return g_lazy_child_tls.Pointer()->Get();
 }
 
 #if defined(OS_ANDROID)