Revert of components/arc: implement multi advertising

Revert of components/arc: implement multi advertising (patchset #17 id:320001 of https://codereview.chromium.org/2256003002/ )

Reason for revert:
Causes LSAN failures: https://uberchromegw.corp.google.com/i/chromium.memory/builders/Linux%20Chromium%20OS%20ASan%20LSan%20Tests%20%281%29/builds/16702

Original issue's description:
> components/arc: implement multi advertising
>
> This plumbs through multi advertising capabilities for the
> instance. Instances can register and unregister advertisements.
>
> BUG=637171
> TEST=use nrf connect on remote device and verify that packets
>   registered from the instance are visible on the remote device
>
> Committed: https://crrev.com/efca08b08a581ec53c7a140fc13e660ed7530865
> Cr-Commit-Position: refs/heads/master@{#423253}

TBR=rickyz@chromium.org,dcheng@chromium.org,lhchavez@chromium.org,puthik@chromium.org,yzshen@chromium.org,steel@chromium.org,ejcaruso@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=637171
Committed: https://crrev.com/9ecaae53a446e54838f86f8a41c005ff7b26a934
Cr-Commit-Position: refs/heads/master@{#423506}

[gab, 2016-10-06 13:09:39]

The CQ bit was checked by gab@chromium.org

[gab, 2016-10-06 13:09:39]

Created Revert of components/arc: implement multi advertising

[commit-bot: I haz the power, 2016-10-06 13:09:51]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[gab, 2016-10-06 13:10:21]

On 2016/10/06 13:09:39, gab wrote:
> Created Revert of components/arc: implement multi advertising

Example LSAN failure in components_unittests:

BluetoothStructTraitsTest.DeserializeBluetoothAdvertisement (run #1):
[ RUN      ] BluetoothStructTraitsTest.DeserializeBluetoothAdvertisement
[       OK ] BluetoothStructTraitsTest.DeserializeBluetoothAdvertisement (0 ms)
[----------] 1 test from BluetoothStructTraitsTest (1 ms total)

[----------] Global test environment tear-down
[==========] 1 test from 1 test case ran. (2 ms total)
[  PASSED  ] 1 test.

=================================================================
==6756==ERROR: LeakSanitizer: detected memory leaks

Direct leak of 32 byte(s) in 1 object(s) allocated from:
    #0 0xab785b in operator new(unsigned long)
(/b/swarm_slave/w/iruUsHhy/out/Release/components_unittests+0xab785b)
    #1 0x13eb4afe in allocate
build/linux/ubuntu_precise_amd64-sysroot/usr/lib/gcc/x86_64-linux-gnu/4.6/../../../../include/c++/4.6/ext/new_allocator.h:92:27
    #2 0x13eb4afe in _M_allocate
build/linux/ubuntu_precise_amd64-sysroot/usr/lib/gcc/x86_64-linux-gnu/4.6/../../../../include/c++/4.6/bits/stl_vector.h:150
    #3 0x13eb4afe in _Vector_base
build/linux/ubuntu_precise_amd64-sysroot/usr/lib/gcc/x86_64-linux-gnu/4.6/../../../../include/c++/4.6/bits/stl_vector.h:115
    #4 0x13eb4afe in vector
build/linux/ubuntu_precise_amd64-sysroot/usr/lib/gcc/x86_64-linux-gnu/4.6/../../../../include/c++/4.6/bits/stl_vector.h:238
    #5 0x13eb4afe in Resize mojo/public/cpp/bindings/array_traits_stl.h:56
    #6 0x13eb4afe in
mojo::internal::ArraySerializer<mojo::ArrayDataView<arc::mojom::BluetoothUUIDDataView>,
std::vector<device::BluetoothUUID, std::allocator<device::BluetoothUUID> >,
mojo::internal::ArrayIterator<mojo::ArrayTraits<std::vector<device::BluetoothUUID,
std::allocator<device::BluetoothUUID> > >, std::vector<device::BluetoothUUID,
std::allocator<device::BluetoothUUID> >, false>,
void>::DeserializeElements(mojo::internal::Array_Data<mojo::internal::Pointer<arc::mojom::internal::BluetoothUUID_Data>
>*, std::vector<device::BluetoothUUID, std::allocator<device::BluetoothUUID> >*,
mojo::internal::SerializationContext*)
mojo/public/cpp/bindings/lib/array_serialization.h:392
    #7 0x13eb41fc in Deserialize
mojo/public/cpp/bindings/lib/array_serialization.h:540:12
    #8 0x13eb41fc in
Deserialize<mojo::ArrayDataView<arc::mojom::BluetoothUUIDDataView>,
mojo::internal::Array_Data<mojo::internal::Pointer<arc::mojom::internal::BluetoothUUID_Data>
> *, std::vector<device::BluetoothUUID, std::allocator<device::BluetoothUUID> >,
mojo::internal::SerializationContext *&, nullptr>
mojo/public/cpp/bindings/lib/serialization_forward.h:70
    #9 0x13eb41fc in bool
arc::mojom::BluetoothAdvertisingDataDataView::ReadServiceUuids<std::vector<device::BluetoothUUID,
std::allocator<device::BluetoothUUID> > >(std::vector<device::BluetoothUUID,
std::allocator<device::BluetoothUUID> >*)
out/Release/gen/components/arc/common/bluetooth.mojom-shared.h:3635
    #10 0x13eb2d54 in Read
components/arc/bluetooth/bluetooth_struct_traits.cc:161:19
    #11 0x13eb2d54 in Deserialize
out/Release/gen/components/arc/common/bluetooth.mojom-shared.h:5563
    #12 0x13eb2d54 in Deserialize<arc::mojom::BluetoothAdvertisingDataDataView,
arc::mojom::internal::BluetoothAdvertisingData_Data *,
std::unique_ptr<(anonymous namespace)::AdvertisementEntry,
std::default_delete<(anonymous namespace)::AdvertisementEntry> >,
mojo::internal::SerializationContext *&, nullptr>
mojo/public/cpp/bindings/lib/serialization_forward.h:70
    #13 0x13eb2d54 in DeserializeElements
mojo/public/cpp/bindings/lib/array_serialization.h:486
    #14 0x13eb2d54 in Deserialize
mojo/public/cpp/bindings/lib/array_serialization.h:540
    #15 0x13eb2d54 in
Deserialize<mojo::ArrayDataView<arc::mojom::BluetoothAdvertisingDataDataView>,
mojo::internal::Array_Data<arc::mojom::internal::BluetoothAdvertisingData_Data>
*&, std::vector<std::unique_ptr<(anonymous namespace)::AdvertisementEntry,
std::default_delete<(anonymous namespace)::AdvertisementEntry> >,
std::allocator<std::unique_ptr<(anonymous namespace)::AdvertisementEntry,
std::default_delete<(anonymous namespace)::AdvertisementEntry> > > >,
mojo::internal::SerializationContext *&, nullptr>
mojo/public/cpp/bindings/lib/serialization_forward.h:70
    #16 0x13eb2d54 in ReadData<std::vector<std::unique_ptr<(anonymous
namespace)::AdvertisementEntry, std::default_delete<(anonymous
namespace)::AdvertisementEntry> >, std::allocator<std::unique_ptr<(anonymous
namespace)::AdvertisementEntry, std::default_delete<(anonymous
namespace)::AdvertisementEntry> > > > >
out/Release/gen/components/arc/common/bluetooth.mojom-shared.h:913
    #17 0x13eb2d54 in
mojo::StructTraits<arc::mojom::BluetoothAdvertisementDataView,
std::unique_ptr<device::BluetoothAdvertisement::Data,
std::default_delete<device::BluetoothAdvertisement::Data> >
>::Read(arc::mojom::BluetoothAdvertisementDataView,
std::unique_ptr<device::BluetoothAdvertisement::Data,
std::default_delete<device::BluetoothAdvertisement::Data> >*)
components/arc/bluetooth/bluetooth_struct_traits.cc:220
    #18 0x50cfad2 in Deserialize
out/Release/gen/components/arc/common/bluetooth.mojom-shared.h:4776:12
    #19 0x50cfad2 in Deserialize<arc::mojom::BluetoothAdvertisementDataView,
arc::mojom::internal::BluetoothAdvertisement_Data *&,
std::unique_ptr<device::BluetoothAdvertisement::Data,
std::default_delete<device::BluetoothAdvertisement::Data> >,
mojo::internal::SerializationContext *, nullptr>
mojo/public/cpp/bindings/lib/serialization_forward.h:70
    #20 0x50cfad2 in bool
mojo::internal::StructDeserializeImpl<arc::mojom::BluetoothAdvertisementDataView,
mojo::Array<unsigned char>,
std::unique_ptr<device::BluetoothAdvertisement::Data,
std::default_delete<device::BluetoothAdvertisement::Data> >
>(mojo::Array<unsigned char> const&,
std::unique_ptr<device::BluetoothAdvertisement::Data,
std::default_delete<device::BluetoothAdvertisement::Data> >*)
mojo/public/cpp/bindings/lib/serialization.h:97
    #21 0x50bd91e in
Deserialize<std::unique_ptr<device::BluetoothAdvertisement::Data,
std::default_delete<device::BluetoothAdvertisement::Data> > >
out/Release/gen/components/arc/common/bluetooth.mojom.h:1409:12
    #22 0x50bd91e in ConvertFromMojo<arc::mojom::BluetoothAdvertisement,
std::unique_ptr<device::BluetoothAdvertisement::Data,
std::default_delete<device::BluetoothAdvertisement::Data> > >
components/arc/bluetooth/bluetooth_struct_traits_unittest.cc:36
    #23 0x50bd91e in
mojo::BluetoothStructTraitsTest_DeserializeBluetoothAdvertisement_Test::TestBody()
components/arc/bluetooth/bluetooth_struct_traits_unittest.cc:104
    #24 0xa93942b in HandleExceptionsInMethodIfSupported<testing::Test, void>
testing/gtest/src/gtest.cc:2458:12
    #25 0xa93942b in testing::Test::Run() testing/gtest/src/gtest.cc:2474
    #26 0xa93b4bb in testing::TestInfo::Run() testing/gtest/src/gtest.cc:2656:11
    #27 0xa93c276 in testing::TestCase::Run() testing/gtest/src/gtest.cc:2774:28
    #28 0xa9502c6 in testing::internal::UnitTestImpl::RunAllTests()
testing/gtest/src/gtest.cc:4647:43
    #29 0xa94f927 in
HandleExceptionsInMethodIfSupported<testing::internal::UnitTestImpl, bool>
testing/gtest/src/gtest.cc:2458:12
    #30 0xa94f927 in testing::UnitTest::Run() testing/gtest/src/gtest.cc:4255
    #31 0xa0bbfbb in RUN_ALL_TESTS testing/gtest/include/gtest/gtest.h:2237:46
    #32 0xa0bbfbb in base::TestSuite::Run() base/test/test_suite.cc:246
    #33 0xa0c2988 in Run base/callback.h:64:12
    #34 0xa0c2988 in base::(anonymous
namespace)::LaunchUnitTestsInternal(base::Callback<int (),
(base::internal::CopyMode)1, (base::internal::RepeatMode)1> const&, int, int,
bool, base::Callback<void (), (base::internal::CopyMode)1,
(base::internal::RepeatMode)1> const&)
base/test/launcher/unit_test_launcher.cc:210
    #35 0xa0c265e in base::LaunchUnitTests(int, char**, base::Callback<int (),
(base::internal::CopyMode)1, (base::internal::RepeatMode)1> const&)
base/test/launcher/unit_test_launcher.cc:452:10
    #36 0xabab7b in main components/test/run_all_unittests.cc:154:10
    #37 0x7f96e8e327ec in __libc_start_main
/build/eglibc-oqps9y/eglibc-2.15/csu/libc-start.c:226

[commit-bot: I haz the power, 2016-10-06 13:10:22]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-10-06 13:10:24]

Failed to apply patch for
components/arc/bluetooth/bluetooth_struct_traits_unittest.cc:
While running git apply --index -3 -p1;
  error: patch failed:
components/arc/bluetooth/bluetooth_struct_traits_unittest.cc:67
  Falling back to three-way merge...
  Applied patch to
'components/arc/bluetooth/bluetooth_struct_traits_unittest.cc' with conflicts.
  U components/arc/bluetooth/bluetooth_struct_traits_unittest.cc

Patch:       components/arc/bluetooth/bluetooth_struct_traits_unittest.cc
Index: components/arc/bluetooth/bluetooth_struct_traits_unittest.cc
diff --git a/components/arc/bluetooth/bluetooth_struct_traits_unittest.cc
b/components/arc/bluetooth/bluetooth_struct_traits_unittest.cc
index
94adbbb734fcec269ca99865719cf36f560cc6ce..7d152417fe84dbddb5a5757b015898022e2a369d
100644
--- a/components/arc/bluetooth/bluetooth_struct_traits_unittest.cc
+++ b/components/arc/bluetooth/bluetooth_struct_traits_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "components/arc/bluetooth/bluetooth_struct_traits.h"
 
-#include "base/macros.h"
 #include "device/bluetooth/bluetooth_uuid.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -16,11 +15,6 @@
                                   0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf1,
                                   0x23, 0x45, 0x67, 0x89};
 constexpr size_t kUuidSize = 16;
-
-constexpr char kUuid16Str[] = "1234";
-constexpr uint16_t kUuid16 = 0x1234;
-constexpr uint8_t kServiceData[] = {0x11, 0x22, 0x33, 0x44, 0x55};
-constexpr uint8_t kManufacturerData[] = {0x00, 0xe0};
 
 template <typename MojoType, typename UserType>
 mojo::StructPtr<MojoType> ConvertToMojo(UserType& input) {
@@ -55,8 +49,6 @@
   for (size_t i = 0; i < kUuidSize; i++) {
     uuid_mojo->uuid.push_back(kUuidArray[i]);
   }
-  uuid_mojo->uuid =
-      std::vector<uint8_t>(std::begin(kUuidArray), std::end(kUuidArray));
   device::BluetoothUUID uuid_device;
   EXPECT_TRUE(ConvertFromMojo(std::move(uuid_mojo), &uuid_device));
   EXPECT_EQ(std::string(kUuidStr), uuid_device.canonical_value());
@@ -67,87 +59,4 @@
   // array<uint8, 16>.
 }
 
-TEST(BluetoothStructTraitsTest, DeserializeBluetoothAdvertisement) {
-  arc::mojom::BluetoothAdvertisementPtr advertisement_mojo =
-      arc::mojom::BluetoothAdvertisement::New();
-  mojo::Array<arc::mojom::BluetoothAdvertisingDataPtr> adv_data;
-
-  // Create service UUIDs.
-  arc::mojom::BluetoothAdvertisingDataPtr data =
-      arc::mojom::BluetoothAdvertisingData::New();
-  std::vector<device::BluetoothUUID> service_uuids;
-  service_uuids.push_back((device::BluetoothUUID(kUuidStr)));
-  data->set_service_uuids(service_uuids);
-  adv_data.push_back(std::move(data));
-
-  // Create service data.
-  data = arc::mojom::BluetoothAdvertisingData::New();
-  arc::mojom::BluetoothServiceDataPtr service_data =
-      arc::mojom::BluetoothServiceData::New();
-  service_data->uuid_16bit = kUuid16;
-  service_data->data =
-      std::vector<uint8_t>(std::begin(kServiceData), std::end(kServiceData));
-  data->set_service_data(std::move(service_data));
-  adv_data.push_back(std::move(data));
-
-  // Create manufacturer data.
-  data = arc::mojom::BluetoothAdvertisingData::New();
-  data->set_manufacturer_data(std::vector<uint8_t>(
-      std::begin(kManufacturerData), std::end(kManufacturerData)));
-  adv_data.push_back(std::move(data));
-
-  advertisement_mojo->type =
-      arc::mojom::BluetoothAdvertisementType::ADV_TYPE_CONNECTABLE;
-  advertisement_mojo->data = std::move(adv_data);
-
-  std::unique_ptr<device::BluetoothAdvertisement::Data> advertisement;
-  EXPECT_TRUE(ConvertFromMojo(std::move(advertisement_mojo), &advertisement));
-
-  EXPECT_EQ(advertisement->type(),
-            device::BluetoothAdvertisement::ADVERTISEMENT_TYPE_PERIPHERAL);
-
-  std::unique_ptr<device::BluetoothAdvertisement::UUIDList> converted_uuids =
-      advertisement->service_uuids();
-  EXPECT_EQ(converted_uuids->size(), 1U);
-  EXPECT_EQ(*converted_uuids->begin(), kUuidStr);
-
-  std::unique_ptr<device::BluetoothAdvertisement::ServiceData>
-      converted_service = advertisement->service_data();
-  EXPECT_EQ(converted_service->size(), 1U);
-  EXPECT_EQ(converted_service->begin()->first, kUuid16Str);
-  for (size_t i = 0; i < arraysize(kServiceData); i++) {
-    EXPECT_EQ(kServiceData[i], converted_service->begin()->second[i]);
-  }
-
-  std::unique_ptr<device::BluetoothAdvertisement::ManufacturerData>
-      converted_manufacturer = advertisement->manufacturer_data();
-  EXPECT_EQ(converted_manufacturer->size(), 1U);
-  uint16_t cic = converted_manufacturer->begin()->first;
-  EXPECT_EQ(cic & 0xff, kManufacturerData[0]);
-  EXPECT_EQ((cic >> 8) & 0xff, kManufacturerData[1]);
-  EXPECT_EQ(converted_manufacturer->begin()->second.size(),
-            static_cast<unsigned long>(arraysize(kManufacturerData) -
-                                       sizeof(uint16_t)));
-}
-
-TEST(BluetoothStructTraitsTest, DeserializeBluetoothAdvertisementFailure) {
-  arc::mojom::BluetoothAdvertisementPtr advertisement_mojo =
-      arc::mojom::BluetoothAdvertisement::New();
-  mojo::Array<arc::mojom::BluetoothAdvertisingDataPtr> adv_data;
-
-  // Create empty manufacturer data. Manufacturer data must include the CIC
-  // which is 2 bytes long.
-  arc::mojom::BluetoothAdvertisingDataPtr data =
-      arc::mojom::BluetoothAdvertisingData::New();
-  data->set_manufacturer_data((mojo::Array<uint8_t>()));
-  adv_data.push_back(std::move(data));
-
-  advertisement_mojo->type =
-      arc::mojom::BluetoothAdvertisementType::ADV_TYPE_CONNECTABLE;
-  advertisement_mojo->data = std::move(adv_data);
-
-  std::unique_ptr<device::BluetoothAdvertisement::Data> advertisement;
-  EXPECT_FALSE(ConvertFromMojo(std::move(advertisement_mojo), &advertisement));
-}
-
 }  // namespace mojo

[gab, 2016-10-06 13:22:02]

The CQ bit was checked by gab@chromium.org

[commit-bot: I haz the power, 2016-10-06 13:22:11]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-10-06 13:23:06]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-10-06 13:25:32]

Description was changed from

==========
Revert of components/arc: implement multi advertising (patchset #17 id:320001 of
https://codereview.chromium.org/2256003002/ )

Reason for revert:
Causes LSAN failures:
https://uberchromegw.corp.google.com/i/chromium.memory/builders/Linux%20Chrom...

Original issue's description:
> components/arc: implement multi advertising
> 
> This plumbs through multi advertising capabilities for the
> instance. Instances can register and unregister advertisements.
> 
> BUG=637171
> TEST=use nrf connect on remote device and verify that packets
>   registered from the instance are visible on the remote device
> 
> Committed: https://crrev.com/efca08b08a581ec53c7a140fc13e660ed7530865
> Cr-Commit-Position: refs/heads/master@{#423253}

TBR=rickyz@chromium.org,dcheng@chromium.org,lhchavez@chromium.org,puthik@chro...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=637171
==========

to

==========
Revert of components/arc: implement multi advertising (patchset #17 id:320001 of
https://codereview.chromium.org/2256003002/ )

Reason for revert:
Causes LSAN failures:
https://uberchromegw.corp.google.com/i/chromium.memory/builders/Linux%20Chrom...

Original issue's description:
> components/arc: implement multi advertising
>
> This plumbs through multi advertising capabilities for the
> instance. Instances can register and unregister advertisements.
>
> BUG=637171
> TEST=use nrf connect on remote device and verify that packets
>   registered from the instance are visible on the remote device
>
> Committed: https://crrev.com/efca08b08a581ec53c7a140fc13e660ed7530865
> Cr-Commit-Position: refs/heads/master@{#423253}

TBR=rickyz@chromium.org,dcheng@chromium.org,lhchavez@chromium.org,puthik@chro...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=637171

Committed: https://crrev.com/9ecaae53a446e54838f86f8a41c005ff7b26a934
Cr-Commit-Position: refs/heads/master@{#423506}
==========

[commit-bot: I haz the power, 2016-10-06 13:25:33]

Patchset 1 (id:??) landed as
https://crrev.com/9ecaae53a446e54838f86f8a41c005ff7b26a934
Cr-Commit-Position: refs/heads/master@{#423506}