Update To 11.40.268.0

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

diff --git a/src/chromeos/dbus/bluetooth_agent_manager_client.cc b/src/chromeos/dbus/bluetooth_agent_manager_client.cc
index 5bf534f..40c8ebe 100644 (file)
--- a/src/chromeos/dbus/bluetooth_agent_manager_client.cc
+++ b/src/chromeos/dbus/bluetooth_agent_manager_client.cc
@@ -6,7 +6,6 @@
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "chromeos/dbus/fake_bluetooth_agent_manager_client.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
@@ -31,7 +30,7 @@ class BluetoothAgentManagerClientImpl
   virtual void RegisterAgent(const dbus::ObjectPath& agent_path,
                              const std::string& capability,
                              const base::Closure& callback,
-                             const ErrorCallback& error_callback) OVERRIDE {
+                             const ErrorCallback& error_callback) override {
     dbus::MethodCall method_call(
     bluetooth_agent_manager::kBluetoothAgentManagerInterface,
     bluetooth_agent_manager::kRegisterAgent);
@@ -52,7 +51,7 @@ class BluetoothAgentManagerClientImpl
   // BluetoothAgentManagerClient override.
   virtual void UnregisterAgent(const dbus::ObjectPath& agent_path,
                                const base::Closure& callback,
-                               const ErrorCallback& error_callback) OVERRIDE {
+                               const ErrorCallback& error_callback) override {
     dbus::MethodCall method_call(
         bluetooth_agent_manager::kBluetoothAgentManagerInterface,
         bluetooth_agent_manager::kUnregisterAgent);
@@ -74,7 +73,7 @@ class BluetoothAgentManagerClientImpl
   virtual void RequestDefaultAgent(const dbus::ObjectPath& agent_path,
                                    const base::Closure& callback,
                                    const ErrorCallback& error_callback)
-      OVERRIDE {
+      override {
     dbus::MethodCall method_call(
         bluetooth_agent_manager::kBluetoothAgentManagerInterface,
         bluetooth_agent_manager::kRequestDefaultAgent);
@@ -92,7 +91,7 @@ class BluetoothAgentManagerClientImpl
   }
 
  protected:
-  virtual void Init(dbus::Bus* bus) OVERRIDE {
+  virtual void Init(dbus::Bus* bus) override {
     DCHECK(bus);
     object_proxy_ = bus->GetObjectProxy(
         bluetooth_agent_manager::kBluetoothAgentManagerServiceName,
@@ -143,12 +142,8 @@ BluetoothAgentManagerClient::BluetoothAgentManagerClient() {
 BluetoothAgentManagerClient::~BluetoothAgentManagerClient() {
 }
 
-BluetoothAgentManagerClient* BluetoothAgentManagerClient::Create(
-    DBusClientImplementationType type) {
-  if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
-    return new BluetoothAgentManagerClientImpl();
-  DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
-  return new FakeBluetoothAgentManagerClient();
+BluetoothAgentManagerClient* BluetoothAgentManagerClient::Create() {
+  return new BluetoothAgentManagerClientImpl();
 }
 
 }  // namespace chromeos