Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chromeos / dbus / bluetooth_adapter_client.cc

diff --git a/src/chromeos/dbus/bluetooth_adapter_client.cc b/src/chromeos/dbus/bluetooth_adapter_client.cc
index d7c383f..3d8d213 100644 (file)
--- a/src/chromeos/dbus/bluetooth_adapter_client.cc
+++ b/src/chromeos/dbus/bluetooth_adapter_client.cc
@@ -6,7 +6,6 @@
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "chromeos/dbus/fake_bluetooth_adapter_client.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_manager.h"
@@ -51,7 +50,8 @@ class BluetoothAdapterClientImpl
     : public BluetoothAdapterClient,
       public dbus::ObjectManager::Interface {
  public:
-  BluetoothAdapterClientImpl() : weak_ptr_factory_(this) {}
+  BluetoothAdapterClientImpl()
+      : object_manager_(NULL), weak_ptr_factory_(this) {}
 
   virtual ~BluetoothAdapterClientImpl() {
     object_manager_->UnregisterInterface(
@@ -258,12 +258,8 @@ BluetoothAdapterClient::BluetoothAdapterClient() {
 BluetoothAdapterClient::~BluetoothAdapterClient() {
 }
 
-BluetoothAdapterClient* BluetoothAdapterClient::Create(
-    DBusClientImplementationType type) {
-  if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
-    return new BluetoothAdapterClientImpl();
-  DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
-  return new FakeBluetoothAdapterClient();
+BluetoothAdapterClient* BluetoothAdapterClient::Create() {
+  return new BluetoothAdapterClientImpl;
 }
 
 }  // namespace chromeos