Revert of Add CPP API for BLE advertisments.

device/bluetooth/bluetooth_adapter.h

 // Copyright (c) 2012 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.
 
 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_H_
 
 #include <list>
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "device/bluetooth/bluetooth_advertisement.h"
 #include "device/bluetooth/bluetooth_audio_sink.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/bluetooth_export.h"
 
 namespace device {
 
-class BluetoothAdvertisement;
 class BluetoothDiscoveryFilter;
 class BluetoothDiscoverySession;
 class BluetoothGattCharacteristic;
 class BluetoothGattDescriptor;
 class BluetoothGattService;
 class BluetoothSocket;
 class BluetoothUUID;
 struct BluetoothAdapterDeleter;
 
 // BluetoothAdapter represents a local Bluetooth adapter which may be used to
@@ skipping 150 matching lines @@
   typedef base::Callback<void(scoped_ptr<BluetoothDiscoverySession>)>
       DiscoverySessionCallback;
   typedef std::vector<BluetoothDevice*> DeviceList;
   typedef std::vector<const BluetoothDevice*> ConstDeviceList;
   typedef base::Callback<void(scoped_refptr<BluetoothSocket>)>
       CreateServiceCallback;
   typedef base::Callback<void(const std::string& message)>
       CreateServiceErrorCallback;
   typedef base::Callback<void(scoped_refptr<BluetoothAudioSink>)>
       AcquiredCallback;
-  typedef base::Callback<void(scoped_refptr<BluetoothAdvertisement>)>
-      CreateAdvertisementCallback;
-  typedef base::Callback<void(BluetoothAdvertisement::ErrorCode)>
-      CreateAdvertisementErrorCallback;
 
   // Returns a weak pointer to a new adapter.  For platforms with asynchronous
   // initialization, the returned adapter will run the |init_callback| once
   // asynchronous initialization is complete.
   // Caution: The returned pointer also transfers ownership of the adapter.  The
   // caller is expected to call |AddRef()| on the returned pointer, typically by
   // storing it into a |scoped_refptr|.
   static base::WeakPtr<BluetoothAdapter> CreateAdapter(
       const InitCallback& init_callback);
 
@@ skipping 159 matching lines @@
   // Creates and registers a BluetoothAudioSink with |options|. If the fields in
   // |options| are not specified, the default values will be used. |callback|
   // will be called on success with a BluetoothAudioSink which is to be owned by
   // the caller of this method. |error_callback| will be called on failure with
   // a message indicating the cause.
   virtual void RegisterAudioSink(
       const BluetoothAudioSink::Options& options,
       const AcquiredCallback& callback,
       const BluetoothAudioSink::ErrorCallback& error_callback) = 0;
 
-  // Creates and registers an advertisement for broadcast over the LE channel.
-  // The created advertisement will be returned via the success callback.
-  virtual void RegisterAdvertisement(
-      scoped_ptr<BluetoothAdvertisement::Data> advertisement_data,
-      const CreateAdvertisementCallback& callback,
-      const CreateAdvertisementErrorCallback& error_callback) = 0;
-
  protected:
   friend class base::RefCounted<BluetoothAdapter>;
   friend class BluetoothDiscoverySession;
 
   typedef std::map<const std::string, BluetoothDevice*> DevicesMap;
   typedef std::pair<BluetoothDevice::PairingDelegate*, PairingDelegatePriority>
       PairingDelegatePair;
 
   BluetoothAdapter();
   virtual ~BluetoothAdapter();
@@ skipping 93 matching lines @@
   std::set<BluetoothDiscoverySession*> discovery_sessions_;
 
   // 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<BluetoothAdapter> weak_ptr_factory_;
 };
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_H_