summaryrefslogtreecommitdiffstats
path: root/ash/test/ash_test_helper.cc
diff options
context:
space:
mode:
authorzelidrag <zelidrag@chromium.org>2014-08-26 18:44:48 -0700
committerCommit bot <commit-bot@chromium.org>2014-08-27 01:45:47 +0000
commit29fe338316a08c2669d2e011889dff2b91dfb616 (patch)
treeb4b49dbe5a9eae924bee60892b2bdda369b440cc /ash/test/ash_test_helper.cc
parent71d115dac733c9532ab73c9e521f1ab545304d14 (diff)
downloadchromium_src-29fe338316a08c2669d2e011889dff2b91dfb616.zip
chromium_src-29fe338316a08c2669d2e011889dff2b91dfb616.tar.gz
chromium_src-29fe338316a08c2669d2e011889dff2b91dfb616.tar.bz2
Part 3: Merged FakedDBusThreadManager with DBusThreadManager.
BUG=401192 TEST=existing tests TBR=sky,stevenjb,keybuk Review URL: https://codereview.chromium.org/477663004 Cr-Commit-Position: refs/heads/master@{#292072}
Diffstat (limited to 'ash/test/ash_test_helper.cc')
-rw-r--r--ash/test/ash_test_helper.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index b9f8ece..86a50d5 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -81,7 +81,7 @@ void AshTestHelper::SetUp(bool start_session) {
#if defined(OS_CHROMEOS)
// Create DBusThreadManager for testing.
if (!chromeos::DBusThreadManager::IsInitialized()) {
- chromeos::DBusThreadManager::InitializeWithStub();
+ chromeos::DBusThreadManager::Initialize();
dbus_thread_manager_initialized_ = true;
}
// Create CrasAudioHandler for testing since g_browser_process is not