athena/test/athena_test_helper.cc - Issue 477663004: Merged FakedDBusThreadManager with DBusThreadManager.

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: athena/test/athena_test_helper.cc

Issue 477663004: Merged FakedDBusThreadManager with DBusThreadManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 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: athena/test/athena_test_helper.cc

diff --git a/athena/test/athena_test_helper.cc b/athena/test/athena_test_helper.cc

index e99b002fc537f187b23a2143bb9ef9535cb822ee..95732812369896241eede42f7e775de85372849d 100644

--- a/athena/test/athena_test_helper.cc

+++ b/athena/test/athena_test_helper.cc

@@ -60,7 +60,7 @@ void AthenaTestHelper::SetUp(ui::ContextFactory* context_factory) {

base::CommandLine::ForCurrentProcess()->AppendSwitch(

app_list::switches::kEnableExperimentalAppList);

- chromeos::DBusThreadManager::InitializeWithStub();

+ chromeos::DBusThreadManager::Initialize();

aura::Env::CreateInstance(true);

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