Refactor DBusThreadManager to split away BT clients.

device/bluetooth/dbus/bluetooth_gatt_service_service_provider.cc

 // Copyright 2014 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 "chromeos/dbus/bluetooth_gatt_service_service_provider.h"
+#include "device/bluetooth/dbus/bluetooth_gatt_service_service_provider.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/platform_thread.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/fake_bluetooth_gatt_service_service_provider.h"
 #include "dbus/exported_object.h"
 #include "dbus/message.h"
+#include "device/bluetooth/dbus/bluez_dbus_manager.h"
+#include "device/bluetooth/dbus/fake_bluetooth_gatt_service_service_provider.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
-namespace chromeos {
+namespace bluez {
 namespace {
-const char kErrorInvalidArgs[] =
-    "org.freedesktop.DBus.Error.InvalidArgs";
+const char kErrorInvalidArgs[] = "org.freedesktop.DBus.Error.InvalidArgs";
 const char kErrorPropertyReadOnly[] =
     "org.freedesktop.DBus.Error.PropertyReadOnly";
 }  // namespace
 
 // The BluetoothGattServiceServiceProvider implementation used in production.
 class BluetoothGattServiceServiceProviderImpl
     : public BluetoothGattServiceServiceProvider {
  public:
   BluetoothGattServiceServiceProviderImpl(
       dbus::Bus* bus,
       const dbus::ObjectPath& object_path,
       const std::string& uuid,
       const std::vector<dbus::ObjectPath>& includes)
       : origin_thread_id_(base::PlatformThread::CurrentId()),
         uuid_(uuid),
         includes_(includes),
         bus_(bus),
         object_path_(object_path),
         weak_ptr_factory_(this) {
     VLOG(1) << "Creating Bluetooth GATT service: " << object_path_.value()
             << " UUID: " << uuid;
     DCHECK(!uuid_.empty());
     DCHECK(object_path_.IsValid());
     DCHECK(bus_);
 
     exported_object_ = bus_->GetExportedObject(object_path_);
 
     exported_object_->ExportMethod(
-        dbus::kDBusPropertiesInterface,
-        dbus::kDBusPropertiesGet,
+        dbus::kDBusPropertiesInterface, dbus::kDBusPropertiesGet,
         base::Bind(&BluetoothGattServiceServiceProviderImpl::Get,
                    weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&BluetoothGattServiceServiceProviderImpl::OnExported,
                    weak_ptr_factory_.GetWeakPtr()));
 
     exported_object_->ExportMethod(
-        dbus::kDBusPropertiesInterface,
-        dbus::kDBusPropertiesSet,
+        dbus::kDBusPropertiesInterface, dbus::kDBusPropertiesSet,
         base::Bind(&BluetoothGattServiceServiceProviderImpl::Set,
                    weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&BluetoothGattServiceServiceProviderImpl::OnExported,
                    weak_ptr_factory_.GetWeakPtr()));
 
     exported_object_->ExportMethod(
-        dbus::kDBusPropertiesInterface,
-        dbus::kDBusPropertiesGetAll,
+        dbus::kDBusPropertiesInterface, dbus::kDBusPropertiesGetAll,
         base::Bind(&BluetoothGattServiceServiceProviderImpl::GetAll,
                    weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&BluetoothGattServiceServiceProviderImpl::OnExported,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
   ~BluetoothGattServiceServiceProviderImpl() override {
     VLOG(1) << "Cleaning up Bluetooth GATT service: " << object_path_.value();
     bus_->UnregisterExportedObject(object_path_);
   }
@@ skipping 10 matching lines @@
            dbus::ExportedObject::ResponseSender response_sender) {
     VLOG(2) << "BluetoothGattServiceServiceProvider::Get: "
             << object_path_.value();
     DCHECK(OnOriginThread());
 
     dbus::MessageReader reader(method_call);
 
     std::string interface_name;
     std::string property_name;
     if (!reader.PopString(&interface_name) ||
-        !reader.PopString(&property_name) ||
-        reader.HasMoreData()) {
+        !reader.PopString(&property_name) || reader.HasMoreData()) {
       scoped_ptr<dbus::ErrorResponse> error_response =
-          dbus::ErrorResponse::FromMethodCall(
-              method_call, kErrorInvalidArgs, "Expected 'ss'.");
+          dbus::ErrorResponse::FromMethodCall(method_call, kErrorInvalidArgs,
+                                              "Expected 'ss'.");
       response_sender.Run(error_response.Pass());
       return;
     }
 
     // Only the GATT service interface is allowed.
     if (interface_name !=
         bluetooth_gatt_service::kBluetoothGattServiceInterface) {
       scoped_ptr<dbus::ErrorResponse> error_response =
           dbus::ErrorResponse::FromMethodCall(
               method_call, kErrorInvalidArgs,
@@ skipping 35 matching lines @@
   // service.
   void Set(dbus::MethodCall* method_call,
            dbus::ExportedObject::ResponseSender response_sender) {
     VLOG(2) << "BluetoothGattServiceServiceProvider::Set: "
             << object_path_.value();
     DCHECK(OnOriginThread());
 
     // All of the properties on this interface are read-only, so just return
     // error.
     scoped_ptr<dbus::ErrorResponse> error_response =
-        dbus::ErrorResponse::FromMethodCall(
-            method_call, kErrorPropertyReadOnly,
-            "All properties are read-only.");
+        dbus::ErrorResponse::FromMethodCall(method_call, kErrorPropertyReadOnly,
+                                            "All properties are read-only.");
     response_sender.Run(error_response.Pass());
   }
 
   // Called by dbus:: when the Bluetooth daemon fetches all properties of the
   // service.
   void GetAll(dbus::MethodCall* method_call,
               dbus::ExportedObject::ResponseSender response_sender) {
     VLOG(2) << "BluetoothGattServiceServiceProvider::GetAll: "
             << object_path_.value();
     DCHECK(OnOriginThread());
 
     dbus::MessageReader reader(method_call);
 
     std::string interface_name;
     if (!reader.PopString(&interface_name) || reader.HasMoreData()) {
       scoped_ptr<dbus::ErrorResponse> error_response =
-          dbus::ErrorResponse::FromMethodCall(
-              method_call, kErrorInvalidArgs, "Expected 's'.");
+          dbus::ErrorResponse::FromMethodCall(method_call, kErrorInvalidArgs,
+                                              "Expected 's'.");
       response_sender.Run(error_response.Pass());
       return;
     }
 
     // Only the GATT service interface is allowed.
     if (interface_name !=
         bluetooth_gatt_service::kBluetoothGattServiceInterface) {
       scoped_ptr<dbus::ErrorResponse> error_response =
           dbus::ErrorResponse::FromMethodCall(
               method_call, kErrorInvalidArgs,
@@ skipping 25 matching lines @@
 
     writer.CloseContainer(&array_writer);
 
     response_sender.Run(response.Pass());
   }
 
   // Called by dbus:: when a method is exported.
   void OnExported(const std::string& interface_name,
                   const std::string& method_name,
                   bool success) {
-    LOG_IF(WARNING, !success) << "Failed to export "
-                              << interface_name << "." << method_name;
+    LOG_IF(WARNING, !success) << "Failed to export " << interface_name << "."
+                              << method_name;
   }
 
   // Origin thread (i.e. the UI thread in production).
   base::PlatformThreadId origin_thread_id_;
 
   // 128-bit service UUID of this object.
   std::string uuid_;
 
   // List of object paths that represent other exported GATT services that are
   // included from this service.
@@ skipping 13 matching lines @@
   // Weak pointer factory for generating 'this' pointers that might live longer
   // than we do.
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<BluetoothGattServiceServiceProviderImpl>
       weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothGattServiceServiceProviderImpl);
 };
 
-BluetoothGattServiceServiceProvider::BluetoothGattServiceServiceProvider() {
-}
+BluetoothGattServiceServiceProvider::BluetoothGattServiceServiceProvider() {}
 
-BluetoothGattServiceServiceProvider::~BluetoothGattServiceServiceProvider() {
-}
+BluetoothGattServiceServiceProvider::~BluetoothGattServiceServiceProvider() {}
 
 // static
 BluetoothGattServiceServiceProvider*
 BluetoothGattServiceServiceProvider::Create(
     dbus::Bus* bus,
     const dbus::ObjectPath& object_path,
     const std::string& uuid,
     const std::vector<dbus::ObjectPath>& includes) {
-  if (!DBusThreadManager::Get()->IsUsingStub(DBusClientBundle::BLUETOOTH)) {
-    return new BluetoothGattServiceServiceProviderImpl(
-        bus, object_path, uuid, includes);
+  if (!bluez::BluezDBusManager::Get()->IsUsingStub()) {
+    return new BluetoothGattServiceServiceProviderImpl(bus, object_path, uuid,
+                                                       includes);
   }
-  return new FakeBluetoothGattServiceServiceProvider(
-      object_path, uuid, includes);
+  return new FakeBluetoothGattServiceServiceProvider(object_path, uuid,
+                                                     includes);
 }
 
-}  // namespace chromeos
+}  // namespace bluez