Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / device / bluetooth / bluetooth_chromeos_unittest.cc

diff --git a/src/device/bluetooth/bluetooth_chromeos_unittest.cc b/src/device/bluetooth/bluetooth_chromeos_unittest.cc
index 87b454f..e083829 100644 (file)
--- a/src/device/bluetooth/bluetooth_chromeos_unittest.cc
+++ b/src/device/bluetooth/bluetooth_chromeos_unittest.cc
@@ -5,12 +5,12 @@
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_bluetooth_adapter_client.h"
 #include "chromeos/dbus/fake_bluetooth_agent_manager_client.h"
 #include "chromeos/dbus/fake_bluetooth_device_client.h"
 #include "chromeos/dbus/fake_bluetooth_gatt_service_client.h"
 #include "chromeos/dbus/fake_bluetooth_input_client.h"
-#include "chromeos/dbus/fake_dbus_thread_manager.h"
 #include "dbus/object_path.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_adapter_chromeos.h"
@@ -56,7 +56,7 @@ class TestObserver : public BluetoothAdapter::Observer {
 
   virtual void AdapterPresentChanged(BluetoothAdapter* adapter,
                                      bool present) OVERRIDE {
-    EXPECT_EQ(adapter_, adapter);
+    EXPECT_EQ(adapter_.get(), adapter);
 
     ++present_changed_count_;
     last_present_ = present;
@@ -64,7 +64,7 @@ class TestObserver : public BluetoothAdapter::Observer {
 
   virtual void AdapterPoweredChanged(BluetoothAdapter* adapter,
                                      bool powered) OVERRIDE {
-    EXPECT_EQ(adapter_, adapter);
+    EXPECT_EQ(adapter_.get(), adapter);
 
     ++powered_changed_count_;
     last_powered_ = powered;
@@ -72,14 +72,14 @@ class TestObserver : public BluetoothAdapter::Observer {
 
   virtual void AdapterDiscoverableChanged(BluetoothAdapter* adapter,
                                           bool discoverable) OVERRIDE {
-    EXPECT_EQ(adapter_, adapter);
+    EXPECT_EQ(adapter_.get(), adapter);
 
     ++discoverable_changed_count_;
   }
 
   virtual void AdapterDiscoveringChanged(BluetoothAdapter* adapter,
                                          bool discovering) OVERRIDE {
-    EXPECT_EQ(adapter_, adapter);
+    EXPECT_EQ(adapter_.get(), adapter);
 
     ++discovering_changed_count_;
     last_discovering_ = discovering;
@@ -87,7 +87,7 @@ class TestObserver : public BluetoothAdapter::Observer {
 
   virtual void DeviceAdded(BluetoothAdapter* adapter,
                            BluetoothDevice* device) OVERRIDE {
-    EXPECT_EQ(adapter_, adapter);
+    EXPECT_EQ(adapter_.get(), adapter);
 
     ++device_added_count_;
     last_device_ = device;
@@ -98,7 +98,7 @@ class TestObserver : public BluetoothAdapter::Observer {
 
   virtual void DeviceChanged(BluetoothAdapter* adapter,
                              BluetoothDevice* device) OVERRIDE {
-    EXPECT_EQ(adapter_, adapter);
+    EXPECT_EQ(adapter_.get(), adapter);
 
     ++device_changed_count_;
     last_device_ = device;
@@ -109,7 +109,7 @@ class TestObserver : public BluetoothAdapter::Observer {
 
   virtual void DeviceRemoved(BluetoothAdapter* adapter,
                              BluetoothDevice* device) OVERRIDE {
-    EXPECT_EQ(adapter_, adapter);
+    EXPECT_EQ(adapter_.get(), adapter);
 
     ++device_removed_count_;
     // Can't save device, it may be freed
@@ -234,23 +234,23 @@ class TestPairingDelegate : public BluetoothDevice::PairingDelegate {
 class BluetoothChromeOSTest : public testing::Test {
  public:
   virtual void SetUp() {
-    FakeDBusThreadManager* fake_dbus_thread_manager = new FakeDBusThreadManager;
+    scoped_ptr<DBusThreadManagerSetter> dbus_setter =
+        chromeos::DBusThreadManager::GetSetterForTesting();
     // We need to initialize DBusThreadManager early to prevent
     // Bluetooth*::Create() methods from picking the real instead of fake
     // implementations.
-    DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager);
     fake_bluetooth_adapter_client_ = new FakeBluetoothAdapterClient;
-    fake_dbus_thread_manager->SetBluetoothAdapterClient(
+    dbus_setter->SetBluetoothAdapterClient(
         scoped_ptr<BluetoothAdapterClient>(fake_bluetooth_adapter_client_));
     fake_bluetooth_device_client_ = new FakeBluetoothDeviceClient;
-    fake_dbus_thread_manager->SetBluetoothDeviceClient(
+    dbus_setter->SetBluetoothDeviceClient(
         scoped_ptr<BluetoothDeviceClient>(fake_bluetooth_device_client_));
-    fake_dbus_thread_manager->SetBluetoothInputClient(
+    dbus_setter->SetBluetoothInputClient(
         scoped_ptr<BluetoothInputClient>(new FakeBluetoothInputClient));
-    fake_dbus_thread_manager->SetBluetoothAgentManagerClient(
+    dbus_setter->SetBluetoothAgentManagerClient(
         scoped_ptr<BluetoothAgentManagerClient>(
             new FakeBluetoothAgentManagerClient));
-    fake_dbus_thread_manager->SetBluetoothGattServiceClient(
+    dbus_setter->SetBluetoothGattServiceClient(
         scoped_ptr<BluetoothGattServiceClient>(
             new FakeBluetoothGattServiceClient));