ui/aura/test/aura_test_helper.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: ui/aura/test/aura_test_helper.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: ui/aura/test/aura_test_helper.cc

diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc

index 5823922d180cd88b53879c25db4b0f6e8a0592e1..1b56512d376508eed8ae10942a520ebf3b37b455 100644

--- a/ui/aura/test/aura_test_helper.cc

+++ b/ui/aura/test/aura_test_helper.cc

@@ -52,10 +52,11 @@ AuraTestHelper::~AuraTestHelper() {

<< "AuraTestHelper::TearDown() never called.";

}

-void AuraTestHelper::SetUp() {

+void AuraTestHelper::SetUp(ui::ContextFactory* context_factory) {

setup_called_ = true;

Env::CreateInstance(true);

+ Env::GetInstance()->set_context_factory(context_factory);

// Unit tests generally don't want to query the system, rather use the state

// from RootWindow.

EnvTestHelper(Env::GetInstance()).SetInputStateLookup(

« no previous file with comments | « ui/aura/test/aura_test_helper.h ('k') | ui/aura/window_tree_host.cc » ('j') | no next file with comments »