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

base/memory/discardable_memory_allocator.cc

 // Copyright 2015 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 "base/memory/discardable_memory_allocator.h"
 
 #include "base/logging.h"
 
 namespace base {
 namespace {
 
-DiscardableMemoryAllocator* g_allocator = nullptr;
+DiscardableMemoryAllocator* g_discardable_memory_allocator = nullptr;
 
 }  // namespace
 
 // static
 void DiscardableMemoryAllocator::SetInstance(
     DiscardableMemoryAllocator* allocator) {
-  DCHECK(!allocator || !g_allocator);
-  g_allocator = allocator;
+  DCHECK(!allocator || !g_discardable_memory_allocator);
+  g_discardable_memory_allocator = allocator;
 }
 
 // static
 DiscardableMemoryAllocator* DiscardableMemoryAllocator::GetInstance() {
-  DCHECK(g_allocator);
-  return g_allocator;
+  DCHECK(g_discardable_memory_allocator);
+  return g_discardable_memory_allocator;
 }
 
 }  // namespace base