Revert of Add CPP API for BLE advertisments.

chromeos/dbus/bluetooth_le_advertisement_service_provider.cc

 // Copyright 2015 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_le_advertisement_service_provider.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/stl_util.h"
@@ skipping 19 matching lines @@
       const dbus::ObjectPath& object_path,
       Delegate* delegate,
       AdvertisementType type,
       scoped_ptr<UUIDList> service_uuids,
       scoped_ptr<ManufacturerData> manufacturer_data,
       scoped_ptr<UUIDList> solicit_uuids,
       scoped_ptr<ServiceData> service_data)
       : 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()),
         solicit_uuids_(solicit_uuids.Pass()),
         service_data_(service_data.Pass()),
         weak_ptr_factory_(this) {
     DCHECK(bus);
     DCHECK(delegate);
 
     VLOG(1) << "Creating Bluetooth Advertisement: " << object_path_.value();
 
-    object_path_ = object_path;
     exported_object_ = bus_->GetExportedObject(object_path_);
 
     // Export Bluetooth Advertisement interface methods.
     exported_object_->ExportMethod(
         bluetooth_advertisement::kBluetoothAdvertisementIntervace,
         bluetooth_advertisement::kRelease,
         base::Bind(&BluetoothAdvertisementServiceProviderImpl::Release,
                    weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&BluetoothAdvertisementServiceProviderImpl::OnExported,
                    weak_ptr_factory_.GetWeakPtr()));
@@ skipping 289 matching lines @@
 
   // D-Bus bus object is exported on, not owned by this object and must
   // outlive it.
   dbus::Bus* bus_;
 
   // All incoming method calls are passed on to the Delegate and a callback
   // passed to generate the reply. |delegate_| is generally the object that
   // 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_;
   scoped_ptr<ManufacturerData> manufacturer_data_;
   scoped_ptr<UUIDList> solicit_uuids_;
   scoped_ptr<ServiceData> service_data_;
 
   // D-Bus object we are exporting, owned by this object.
   scoped_refptr<dbus::ExportedObject> exported_object_;
 
   // 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<BluetoothAdvertisementServiceProviderImpl>
       weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothAdvertisementServiceProviderImpl);
 };
 
 BluetoothLEAdvertisementServiceProvider::
     BluetoothLEAdvertisementServiceProvider() {
 }
 
 BluetoothLEAdvertisementServiceProvider::
     ~BluetoothLEAdvertisementServiceProvider() {
 }
 
 // static
-scoped_ptr<BluetoothLEAdvertisementServiceProvider>
+BluetoothLEAdvertisementServiceProvider*
 BluetoothLEAdvertisementServiceProvider::Create(
     dbus::Bus* bus,
     const dbus::ObjectPath& object_path,
     Delegate* delegate,
     AdvertisementType type,
     scoped_ptr<UUIDList> service_uuids,
     scoped_ptr<ManufacturerData> manufacturer_data,
     scoped_ptr<UUIDList> solicit_uuids,
     scoped_ptr<ServiceData> service_data) {
   if (!DBusThreadManager::Get()->IsUsingStub(DBusClientBundle::BLUETOOTH)) {
-    return make_scoped_ptr(new BluetoothAdvertisementServiceProviderImpl(
+    return 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 make_scoped_ptr(
-        new FakeBluetoothLEAdvertisementServiceProvider(object_path, delegate));
+    return new FakeBluetoothLEAdvertisementServiceProvider(object_path,
+                                                           delegate);
   }
 }
 
 }  // namespace chromeos