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 b2353d566ec912400fbdd625f9f1a2e3684d078a..251311b7d7b6a7d26ff580a49f6ef8fb9748b900 100644

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

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

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

base::Thread::Options options(base::MessageLoop::TYPE_IO, 0);

file_thread_->StartWithOptions(options);

- chromeos::DBusThreadManager::InitializeWithStub();

+ chromeos::DBusThreadManager::Initialize();

ui::InitializeInputMethodForTesting();

aura::Env::CreateInstance(true);

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

« no previous file with comments | « ash/test/ash_test_helper.cc ('k') | chrome/browser/apps/app_browsertest.cc » ('j') | no next file with comments »