content/renderer/render_thread_impl.cc - Issue 1001873002: base: Rename discardable memory allocator interface and remove unnecessary class.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/render_thread_impl.cc

Issue 1001873002: base: Rename discardable memory allocator interface and remove unnecessary class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove-dm-types

Patch Set: rebase Created 5 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« base/test/test_discardable_memory_allocator.h ('K') | « content/common/host_discardable_shared_memory_manager.cc ('k') | content/test/blink_test_environment.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_thread_impl.cc

diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc

index 4e8819c49cbdf9182268b6ebf187cb801be81044..bcf2c64639b59f7e967997e7d7492a64f3849f0b 100644

--- a/content/renderer/render_thread_impl.cc

+++ b/content/renderer/render_thread_impl.cc

@@ -13,8 +13,7 @@

#include "base/command_line.h"

#include "base/lazy_instance.h"

#include "base/logging.h"

-#include "base/memory/discardable_memory.h"

-#include "base/memory/discardable_memory_shmem_allocator.h"

+#include "base/memory/discardable_memory_allocator.h"

#include "base/memory/shared_memory.h"

#include "base/metrics/field_trial.h"

#include "base/metrics/histogram.h"

@@ -659,7 +658,7 @@ void RenderThreadImpl::Init() {

// In single process, browser main loop set up the discardable memory

// allocator.

if (!command_line.HasSwitch(switches::kSingleProcess)) {

- base::DiscardableMemoryShmemAllocator::SetInstance(

+ base::DiscardableMemoryAllocator::SetInstance(

ChildThreadImpl::discardable_shared_memory_manager());

}