[Nearby] Plumb fast adv uuid for StartDiscovery

The fast advertising uuid was not being passed through to
StartDiscovery in the NearbyConnections layer.

Fixed: 1134779
Change-Id: I94e16540a41d635834cd74febd4eb2b4ffb309c5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2448110Reviewed-by: Ryan Hansberry <hansberry@chromium.org>
Reviewed-by: Alex Gough <ajgo@chromium.org>
Commit-Queue: James Vecore <vecore@google.com>
Cr-Commit-Position: refs/heads/master@{#813836}

chrome/browser/nearby_sharing/nearby_connections_manager_impl.cc

@@ -132,10 +132,10 @@ void NearbyConnectionsManagerImpl::StartDiscovery(
   }
 
   discovery_listener_ = listener;
-  // TODO(b/168659459): Inject kFastAdvertisementServiceUuid once BLE scanning
-  // actually uses it.
   nearby_connections_->StartDiscovery(
-      kServiceId, DiscoveryOptions::New(kStrategy),
+      kServiceId,
+      DiscoveryOptions::New(
+          kStrategy, device::BluetoothUUID(kFastAdvertisementServiceUuid)),
       endpoint_discovery_listener_.BindNewPipeAndPassRemote(),
       std::move(callback));
 }

chrome/browser/nearby_sharing/nearby_connections_manager_impl_unittest.cc

@@ -145,6 +145,9 @@ class NearbyConnectionsManagerImplTest : public testing::Test {
                       NearbyConnectionsMojom::StartDiscoveryCallback callback) {
           EXPECT_EQ(kServiceId, service_id);
           EXPECT_EQ(kStrategy, options->strategy);
+          EXPECT_EQ(
+              device::BluetoothUUID("0000fef3-0000-1000-8000-00805f9b34fb"),
+              options->fast_advertisement_service_uuid);
 
           listener_remote.Bind(std::move(listener));
           std::move(callback).Run(Status::kSuccess);

chrome/services/sharing/nearby/nearby_connections.cc

@@ -185,7 +185,9 @@ void NearbyConnections::StartDiscovery(
     mojo::PendingRemote<mojom::EndpointDiscoveryListener> listener,
     StartDiscoveryCallback callback) {
   ConnectionOptions connection_options{
-      .strategy = StrategyFromMojom(options->strategy)};
+      .strategy = StrategyFromMojom(options->strategy),
+      .fast_advertisement_service_uuid =
+          options->fast_advertisement_service_uuid.canonical_value()};
   mojo::SharedRemote<mojom::EndpointDiscoveryListener> remote(
       std::move(listener));
   DiscoveryListener discovery_listener{

chrome/services/sharing/nearby/nearby_connections_unittest.cc

@@ -211,6 +211,8 @@ class NearbyConnectionsTest : public testing::Test {
           client_proxy = client;
           EXPECT_EQ(kServiceId, service_id);
           EXPECT_EQ(Strategy::kP2pPointToPoint, options.strategy);
+          EXPECT_EQ(kFastAdvertisementServiceUuid,
+                    options.fast_advertisement_service_uuid);
           client->StartedDiscovery(service_id, options.strategy, listener,
                                    /*mediums=*/{});
           return Status{Status::kAlreadyDiscovering};
@@ -219,7 +221,9 @@ class NearbyConnectionsTest : public testing::Test {
     base::RunLoop start_discovery_run_loop;
     nearby_connections_->StartDiscovery(
         kServiceId,
-        mojom::DiscoveryOptions::New(mojom::Strategy::kP2pPointToPoint),
+        mojom::DiscoveryOptions::New(
+            mojom::Strategy::kP2pPointToPoint,
+            device::BluetoothUUID(kFastAdvertisementServiceUuid)),
         fake_discovery_listener.receiver.BindNewPipeAndPassRemote(),
         base::BindLambdaForTesting([&](mojom::Status status) {
           EXPECT_EQ(mojom::Status::kAlreadyDiscovering, status);

chrome/services/sharing/public/mojom/nearby_connections_types.mojom

@@ -148,6 +148,8 @@ struct DiscoveryOptions {
   // The strategy to use for discovering. Must match the strategy used in
   // AdvertisingOptions in order to see advertisements.
   Strategy strategy;
+  // The fast advertisement service id to scan for in BLE.
+  bluetooth.mojom.UUID fast_advertisement_service_uuid;
 };
 
 // Options for a call to NearbyConnections::RequestConnection().