content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc - Issue 2051333004: Implement BluetoothGattNotifySession::Stop on Android, 2nd attempt

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc

Issue 2051333004: Implement BluetoothGattNotifySession::Stop on Android, 2nd attempt (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase onto latest master Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h ('k') | device/bluetooth/BUILD.gn » ('j') | device/bluetooth/bluetooth_gatt_notify_session.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc

diff --git a/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc b/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc

index 16f613fb9e262d26a27454eee54617e2a1454044..eb554d4d8595714f37a7b6c0ed4ead1fec41a9a3 100644

--- a/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc

+++ b/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc

@@ -1124,7 +1124,7 @@ LayoutTestBluetoothAdapterProvider::GetHeartRateService(

.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;

@@ -1253,9 +1253,9 @@ LayoutTestBluetoothAdapterProvider::GetErrorCharacteristic(

// 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(