Revert of Revert of Add CPP API for BLE advertisments.

chromeos/dbus/bluetooth_le_advertisement_service_provider.cc

Index: chromeos/dbus/bluetooth_le_advertisement_service_provider.cc
diff --git a/chromeos/dbus/bluetooth_le_advertisement_service_provider.cc b/chromeos/dbus/bluetooth_le_advertisement_service_provider.cc
index aa3f23451abeda172c40e26afb39f25b6d8329fa..f6a4c44100363cca552856f0ae337a72e35fadaf 100644
--- a/chromeos/dbus/bluetooth_le_advertisement_service_provider.cc
+++ b/chromeos/dbus/bluetooth_le_advertisement_service_provider.cc
@@ -37,7 +37,6 @@
       : origin_thread_id_(base::PlatformThread::CurrentId()),
         bus_(bus),
         delegate_(delegate),
-        object_path_(object_path),
         type_(type),
         service_uuids_(service_uuids.Pass()),
         manufacturer_data_(manufacturer_data.Pass()),
@@ -49,6 +48,7 @@
 
     VLOG(1) << "Creating Bluetooth Advertisement: " << object_path_.value();
 
+    object_path_ = object_path;
     exported_object_ = bus_->GetExportedObject(object_path_);
 
     // Export Bluetooth Advertisement interface methods.
@@ -358,10 +358,6 @@
   // owns this one, and must outlive it.
   Delegate* delegate_;
 
-  // D-Bus object path of object we are exporting, kept so we can unregister
-  // again in our destructor.
-  dbus::ObjectPath object_path_;
-
   // Advertisement data that needs to be provided to BlueZ when requested.
   AdvertisementType type_;
   scoped_ptr<UUIDList> service_uuids_;
@@ -391,7 +387,7 @@
 }
 
 // static
-BluetoothLEAdvertisementServiceProvider*
+scoped_ptr<BluetoothLEAdvertisementServiceProvider>
 BluetoothLEAdvertisementServiceProvider::Create(
     dbus::Bus* bus,
     const dbus::ObjectPath& object_path,
@@ -402,12 +398,12 @@
     scoped_ptr<UUIDList> solicit_uuids,
     scoped_ptr<ServiceData> service_data) {
   if (!DBusThreadManager::Get()->IsUsingStub(DBusClientBundle::BLUETOOTH)) {
-    return new BluetoothAdvertisementServiceProviderImpl(
+    return make_scoped_ptr(new BluetoothAdvertisementServiceProviderImpl(
         bus, object_path, delegate, type, service_uuids.Pass(),
-        manufacturer_data.Pass(), solicit_uuids.Pass(), service_data.Pass());
+        manufacturer_data.Pass(), solicit_uuids.Pass(), service_data.Pass()));
   } else {
-    return new FakeBluetoothLEAdvertisementServiceProvider(object_path,
-                                                           delegate);
+    return make_scoped_ptr(
+        new FakeBluetoothLEAdvertisementServiceProvider(object_path, delegate));
   }
 }