Revert of Reland: Refactor DBusThreadManager to split away BT clients. (patchset #1 id:1 of https://codereview.chromium.org/1411793010/ )

Reason for revert:
Crashes memory bot http://build.chromium.org/p/chromium.memory.fyi/builders/Chromium%20OS%20%28valgrind%29%284%29

Original issue's description:
> Reland: Refactor DBusThreadManager to split away BT clients.
>
> This is a reland of https://codereview.chromium.org/1347193004/
>
> This CL doesn't change any of the code except for merge and lint changes.
>
> The original CL was triggering a test crash in Valgrind. On this patch,
> I've run Valgrind multiple times locally and also additionally run TSan.
> Since I am seeing no failures, after talking to glider@ (who works on
> Valgrind), I'm attempting to re-land this CL.
>
> TBR=armansito@chromium.org, glider@chromium.org, isherman@chromium.org, oshima@chromium.org, sky@chromium.org, stevenjb@chromium.org
> BUG=None.
>
> Committed: https://crrev.com/3c56b94daaf6513891e7da3094ab5054ffbd6262
> Cr-Commit-Position: refs/heads/master@{#357707}

TBR=armansito@chromium.org,glider@chromium.org,isherman@chromium.org,oshima@chromium.org,sky@chromium.org,stevenjb@chromium.org,rkc@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=None.

Review URL: https://codereview.chromium.org/1409383004

Cr-Commit-Position: refs/heads/master@{#357834}

1 files changed, 0 insertions, 7 deletions

diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index 6658576..995b9f5 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)
@@ -90,13 +89,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();
@@ -143,7 +137,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;
   }