Revert of components/arc: implement multi advertising

components/arc/common/bluetooth.mojom

 // Copyright 2016 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.
 
-// Next MinVersion: 7
+// Next MinVersion: 6
 
 module arc.mojom;
 
 import "mojo/common/common_custom_types.mojom";
 
 [Extensible]
 enum BluetoothAdapterState {
   OFF = 0,
   ON
 };
@@ skipping 148 matching lines @@
   uint8 is_primary;
 };
 
 struct BluetoothGattValue {
   BluetoothGattStatus status;
   array<uint8> value;
 };
 
 const int8 kUnknownPower = 127;
 
-// Copied from Android Bluetooth package. See AdvertiseManager$AdvertiseNative
-// http://goo.gl/UnKC5N
-enum BluetoothAdvertisementType {
-  ADV_TYPE_CONNECTABLE = 0,
-  ADV_TYPE_SCANNABLE = 2,
-  ADV_TYPE_NON_CONNECTABLE = 3,
-};
-
 // Copy from Bluetooth Assigned Numbers Document, Generic Access Profile
 // https://www.bluetooth.com/specifications/assigned-numbers/generic-access-profile
 [Extensible]
 enum BluetoothAdvertisingDataType {
   DATA_TYPE_FLAGS = 0x01,
   DATA_TYPE_SERVICE_UUIDS_16_BIT_COMPLETE = 0x03,
   DATA_TYPE_SERVICE_UUIDS_128_BIT_COMPLETE = 0x07,
   DATA_TYPE_LOCAL_NAME_COMPLETE = 0x09,
   DATA_TYPE_TX_POWER_LEVEL = 0x0A,
   DATA_TYPE_SERVICE_DATA = 0x16,
@@ skipping 12 matching lines @@
   BluetoothServiceData service_data;
   array<uint8> manufacturer_data;
   array<uint8> other_data;
 };
 
 struct BluetoothServiceData {
   uint16 uuid_16bit;
   array<uint8> data;
 };
 
-struct BluetoothAdvertisement {
-  BluetoothAdvertisementType type;
-  bool include_tx_power;
-  array<BluetoothAdvertisingData> data;
-  // Add more here as Chrome supports it.
-};
-
 [Extensible]
 enum BluetoothGattDBAttributeType {
   BTGATT_DB_PRIMARY_SERVICE = 0,
   BTGATT_DB_SECONDARY_SERVICE,
   BTGATT_DB_INCLUDED_SERVICE,
   BTGATT_DB_CHARACTERISTIC,
   BTGATT_DB_DESCRIPTOR,
 };
 
 struct BluetoothGattDBElement {
@@ skipping 47 matching lines @@
 
 struct BluetoothSdpRecord {
   map<uint16, BluetoothSdpAttribute> attrs;
 };
 
 struct BluetoothCreateSdpRecordResult {
   BluetoothStatus status;
   uint32 service_handle;
 };
 
-// Next Method ID: 43
+// Next Method ID: 40
 interface BluetoothHost {
   EnableAdapter@0() => (BluetoothAdapterState state);
   DisableAdapter@1() => (BluetoothAdapterState state);
   GetAdapterProperty@2(BluetoothPropertyType type);
   SetAdapterProperty@3(BluetoothProperty property);
   GetRemoteDeviceProperty@4(BluetoothAddress remote_addr,
                             BluetoothPropertyType type);
   SetRemoteDeviceProperty@5(BluetoothAddress remote_addr,
                             BluetoothProperty property);
   GetRemoteServiceRecord@6(BluetoothAddress remote_addr,
@@ skipping 79 matching lines @@
                                    array<uint8> value)
       => (BluetoothGattStatus status);
 
   // Bluetooth SDP functions
   [MinVersion=5] GetSdpRecords@37(BluetoothAddress remote_addr,
                                   BluetoothUUID target_uuid);
   [MinVersion=5] CreateSdpRecord@38(BluetoothSdpRecord record)
       => (BluetoothCreateSdpRecordResult result);
   [MinVersion=5] RemoveSdpRecord@39(uint32 service_handle)
       => (BluetoothStatus status);
-
-  // Multi-advertisement functions
-  [MinVersion=6] ReserveAdvertisementHandle@40()
-      => (BluetoothGattStatus status, int32 adv_handle);
-  [MinVersion=6] BroadcastAdvertisement@41(int32 adv_handle,
-                                           BluetoothAdvertisement adv)
-      => (BluetoothGattStatus status);
-  [MinVersion=6] ReleaseAdvertisementHandle@42(int32 adv_handle)
-      => (BluetoothGattStatus status);
 };
 
 // Next Method ID: 18
 interface BluetoothInstance {
   Init@0(BluetoothHost host_ptr);
 
   OnAdapterProperties@1(BluetoothStatus status,
                         array<BluetoothProperty> properties);
   OnRemoteDeviceProperties@2(BluetoothStatus status,
                              BluetoothAddress address,
@@ skipping 41 matching lines @@
                                      int32 offset,
                                      array<uint8> value)
       => (BluetoothGattStatus status);
 
   // Bluetooth SDP function
   [MinVersion=5] OnGetSdpRecords@17(BluetoothStatus status,
                                     BluetoothAddress remove_addr,
                                     BluetoothUUID target_uuid,
                                     array<BluetoothSdpRecord> records);
 };