Implement BluetoothGattNotifySession::Stop on Android, 2nd attempt

content/shell/browser/layout_test/layout_test_bluetooth_adapter_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 "content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 886 matching lines @@
       GetBaseGATTCharacteristic(
           "Heart Rate Measurement", heart_rate.get(), kHeartRateMeasurementUUID,
           BluetoothRemoteGattCharacteristic::PROPERTY_NOTIFY));
   NiceMockBluetoothGattCharacteristic* measurement_ptr =
       heart_rate_measurement.get();
 
   ON_CALL(*heart_rate_measurement, StartNotifySession(_, _))
       .WillByDefault(RunCallbackWithResult<0 /* success_callback */>(
           [adapter, measurement_ptr]() {
             std::unique_ptr<NiceMockBluetoothGattNotifySession> notify_session(
-                GetBaseGATTNotifySession(measurement_ptr->GetIdentifier()));
+                GetBaseGATTNotifySession(measurement_ptr->GetWeakPtr()));
 
             std::vector<uint8_t> rate(1 /* size */);
             rate[0] = 60;
 
             notify_session->StartTestNotifications(adapter, measurement_ptr,
                                                    rate);
 
             return notify_session;
           }));
 
@@ skipping 90 matching lines @@
       .WillByDefault(RunCallback<1 /* error_callback */>(error_code));
 
   return characteristic;
 }
 
 // Notify sessions
 
 // static
 std::unique_ptr<NiceMockBluetoothGattNotifySession>
 LayoutTestBluetoothAdapterProvider::GetBaseGATTNotifySession(
-    const std::string& characteristic_identifier) {
+    base::WeakPtr<device::BluetoothRemoteGattCharacteristic> characteristic) {
   std::unique_ptr<NiceMockBluetoothGattNotifySession> session(
-      new NiceMockBluetoothGattNotifySession(characteristic_identifier));
+      new NiceMockBluetoothGattNotifySession(characteristic));
 
   ON_CALL(*session, Stop(_))
       .WillByDefault(testing::DoAll(
           InvokeWithoutArgs(
               session.get(),
               &MockBluetoothGattNotifySession::StopTestNotifications),
           RunCallback<0>()));
 
   return session;
 }
@@ skipping 50 matching lines @@
   return BluetoothUUID();
 }
 
 // static
 std::string LayoutTestBluetoothAdapterProvider::makeMACAddress(uint64_t addr) {
   return BluetoothDevice::CanonicalizeAddress(
       base::StringPrintf("%012" PRIx64, addr));
 }
 
 }  // namespace content