Refactor DBusThreadManager to split away BT clients.

device/bluetooth/bluetooth_advertisement_chromeos_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/fake_bluetooth_le_advertisement_service_provider.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluetooth_advertisement.h"
 #include "device/bluetooth/bluetooth_advertisement_chromeos.h"
+#include "device/bluetooth/dbus/bluez_dbus_manager.h"
+#include "device/bluetooth/dbus/fake_bluetooth_le_advertisement_service_provider.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using device::BluetoothAdapter;
 using device::BluetoothAdapterFactory;
 using device::BluetoothAdvertisement;
 
 namespace chromeos {
 
 class TestAdvertisementObserver : public BluetoothAdvertisement::Observer {
  public:
@@ skipping 17 matching lines @@
  private:
   bool released_;
   scoped_refptr<BluetoothAdvertisement> advertisement_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAdvertisementObserver);
 };
 
 class BluetoothAdvertisementChromeOSTest : public testing::Test {
  public:
   void SetUp() override {
-    DBusThreadManager::Initialize();
+    bluez::BluezDBusManager::Initialize(NULL, true);
 
     callback_count_ = 0;
     error_callback_count_ = 0;
 
     last_callback_count_ = 0;
     last_error_callback_count_ = 0;
 
     last_error_code_ = BluetoothAdvertisement::INVALID_ADVERTISEMENT_ERROR_CODE;
 
     GetAdapter();
   }
 
   void TearDown() override {
     observer_.reset();
     // The adapter should outlive the advertisement.
     advertisement_ = nullptr;
     adapter_ = nullptr;
-    DBusThreadManager::Shutdown();
+    bluez::BluezDBusManager::Shutdown();
   }
 
   // Gets the existing Bluetooth adapter.
   void GetAdapter() {
     BluetoothAdapterFactory::GetAdapter(
         base::Bind(&BluetoothAdvertisementChromeOSTest::GetAdapterCallback,
                    base::Unretained(this)));
   }
 
   // Called whenever BluetoothAdapter is retrieved successfully.
@@ skipping 43 matching lines @@
         base::Bind(
             &BluetoothAdvertisementChromeOSTest::AdvertisementErrorCallback,
             base::Unretained(this)));
 
     message_loop_.RunUntilIdle();
   }
 
   void TriggerReleased(scoped_refptr<BluetoothAdvertisement> advertisement) {
     BluetoothAdvertisementChromeOS* adv =
         static_cast<BluetoothAdvertisementChromeOS*>(advertisement.get());
-    FakeBluetoothLEAdvertisementServiceProvider* provider =
-        static_cast<FakeBluetoothLEAdvertisementServiceProvider*>(
+    bluez::FakeBluetoothLEAdvertisementServiceProvider* provider =
+        static_cast<bluez::FakeBluetoothLEAdvertisementServiceProvider*>(
             adv->provider());
     provider->Release();
   }
 
   // Called whenever RegisterAdvertisement is completed successfully.
   void RegisterCallback(scoped_refptr<BluetoothAdvertisement> advertisement) {
     ++callback_count_;
     advertisement_ = advertisement;
 
     ASSERT_NE(advertisement_.get(), nullptr);
@@ skipping 84 matching lines @@
   TriggerReleased(advertisement);
   EXPECT_TRUE(observer_->released());
 
   // Unregistering an advertisement that has been released should give us an
   // error.
   UnregisterAdvertisement(advertisement);
   ExpectError(BluetoothAdvertisement::ERROR_ADVERTISEMENT_DOES_NOT_EXIST);
 }
 
 }  // namespace chromeos