Enhance the DBus interface for peerd

chromeos/dbus/dbus_client_bundle.h

 // Copyright 2014 The Chromium Authors. All rights reserved.

[hashimoto, 2015/02/05 09:51:11]

Nice cleanup, but I think this part is out of this CL's scope.
Could you split cleanup part to a different CL?
(the same goes for dbus_client_bundle.cc)

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROMEOS_DBUS_DBUS_CLIENT_BUNDLE_H_
 #define CHROMEOS_DBUS_DBUS_CLIENT_BUNDLE_H_
 
+#include <string>
+
 #include "base/memory/scoped_ptr.h"
 #include "chromeos/chromeos_export.h"
 
 namespace chromeos {
 
 class BluetoothAdapterClient;
 class BluetoothAgentManagerClient;
 class BluetoothDeviceClient;
 class BluetoothGattCharacteristicClient;
 class BluetoothGattDescriptorClient;
@@ skipping 94 matching lines @@
   BluetoothDeviceClient* bluetooth_device_client() {
     return bluetooth_device_client_.get();
   }
 
   BluetoothGattCharacteristicClient* bluetooth_gatt_characteristic_client() {
     return bluetooth_gatt_characteristic_client_.get();
   }
 
   BluetoothGattDescriptorClient* bluetooth_gatt_descriptor_client() {
     return bluetooth_gatt_descriptor_client_.get();
+  }
 
-  }
   BluetoothGattManagerClient* bluetooth_gatt_manager_client() {
     return bluetooth_gatt_manager_client_.get();
   }
 
   BluetoothGattServiceClient* bluetooth_gatt_service_client() {
     return bluetooth_gatt_service_client_.get();
   }
 
   BluetoothInputClient* bluetooth_input_client() {
     return bluetooth_input_client_.get();
@@ skipping 178 matching lines @@
   scoped_ptr<SessionManagerClient> session_manager_client_;
   scoped_ptr<SMSClient> sms_client_;
   scoped_ptr<UpdateEngineClient> update_engine_client_;
 
   DISALLOW_COPY_AND_ASSIGN(DBusClientBundle);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_DBUS_CLIENT_BUNDLE_H_