diff options
| author | rkc <rkc@chromium.org> | 2015-10-06 04:25:52 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-06 11:26:53 +0000 |
| commit | c7eeff6a15962486725ac28b0ded7fd9296f1e77 (patch) | |
| tree | 9658dfae6f757fab11e852a17427c43160399ad7 /ash/test/ash_test_helper.cc | |
| parent | 6a4640a83d99484907275aac3bec32c474cb6c63 (diff) | |
| download | chromium_src-c7eeff6a15962486725ac28b0ded7fd9296f1e77.zip chromium_src-c7eeff6a15962486725ac28b0ded7fd9296f1e77.tar.gz chromium_src-c7eeff6a15962486725ac28b0ded7fd9296f1e77.tar.bz2 | |
Revert "Refactor DBusThreadManager to split away BT clients."
This reverts commit 5d3c8959a7aee861b6750fd734cad96bd24e1f9f.
This commit is breaking the valgrind tests.
R=rkc@chromium.org
TBR=armansito@chromium.org, stevenjb@chromium.org, sky@chromium.org
BUG=None.
Review URL: https://codereview.chromium.org/1382923003
Cr-Commit-Position: refs/heads/master@{#352581}
Diffstat (limited to 'ash/test/ash_test_helper.cc')
| -rw-r--r-- | ash/test/ash_test_helper.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc index 336d9c7..a01da66 100644 --- a/ash/test/ash_test_helper.cc +++ b/ash/test/ash_test_helper.cc @@ -32,7 +32,6 @@ #if defined(OS_CHROMEOS) #include "chromeos/audio/cras_audio_handler.h" #include "chromeos/dbus/dbus_thread_manager.h" -#include "device/bluetooth/dbus/bluez_dbus_manager.h" #endif #if defined(OS_WIN) @@ -89,13 +88,8 @@ void AshTestHelper::SetUp(bool start_session) { // Create DBusThreadManager for testing. if (!chromeos::DBusThreadManager::IsInitialized()) { chromeos::DBusThreadManager::Initialize(); - bluez::BluezDBusManager::Initialize( - chromeos::DBusThreadManager::Get()->GetSystemBus(), - chromeos::DBusThreadManager::Get()->IsUsingStub( - chromeos::DBusClientBundle::BLUETOOTH)); dbus_thread_manager_initialized_ = true; } - // Create CrasAudioHandler for testing since g_browser_process is not // created in AshTestBase tests. chromeos::CrasAudioHandler::InitializeForTesting(); @@ -138,7 +132,6 @@ void AshTestHelper::TearDown() { #if defined(OS_CHROMEOS) chromeos::CrasAudioHandler::Shutdown(); if (dbus_thread_manager_initialized_) { - bluez::BluezDBusManager::Shutdown(); chromeos::DBusThreadManager::Shutdown(); dbus_thread_manager_initialized_ = false; } |