content/public/test/test_renderer_host.cc - Issue 296053009: Makes Env contain a ContextFactory

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/public/test/test_renderer_host.cc

Issue 296053009: Makes Env contain a ContextFactory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: foo Created 6 years, 7 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:

Index: content/public/test/test_renderer_host.cc

diff --git a/content/public/test/test_renderer_host.cc b/content/public/test/test_renderer_host.cc

index abaa4cefe2f6dda4520e8ec5bc571349ff2c2dd9..45e8306a546e927bc643a61532663440493ca81d 100644

--- a/content/public/test/test_renderer_host.cc

+++ b/content/public/test/test_renderer_host.cc

@@ -170,11 +170,12 @@ void RenderViewHostTestHarness::SetUp() {

#if defined(USE_AURA)

// The ContextFactory must exist before any Compositors are created.

bool enable_pixel_output = false;

- ui::InitializeContextFactoryForTests(enable_pixel_output);

+ ui::ContextFactory* context_factory =

+ ui::InitializeContextFactoryForTests(enable_pixel_output);

aura_test_helper_.reset(

new aura::test::AuraTestHelper(base::MessageLoopForUI::current()));

- aura_test_helper_->SetUp();

+ aura_test_helper_->SetUp(context_factory);

new wm::DefaultActivationClient(aura_test_helper_->root_window());

#endif