content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h - Issue 2196883002: bluetooth: Add optional 'name' support to MockBluetoothDevice.

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

Issue 2196883002: bluetooth: Add optional 'name' support to MockBluetoothDevice. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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 | « components/proximity_auth/ble/bluetooth_low_energy_connection_finder_unittest.cc ('k') | content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index c45305074c754680c112145872c21ef2ce4cc37b..041e7a8ef3cd977c3b1426fe37a22d0b2c11426b 100644

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

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

@@ -394,7 +394,7 @@ class LayoutTestBluetoothAdapterProvider {

// BluetoothDevice::ConnectErrorCode::ERROR_UNSUPPORTED_DEVICE.

static std::unique_ptr<testing::NiceMock<device::MockBluetoothDevice>>

GetBaseDevice(device::MockBluetoothAdapter* adapter,

- const std::string& device_name = "Base Device",

+ const char* device_name = "Base Device",

device::BluetoothDevice::UUIDList uuids =

device::BluetoothDevice::UUIDList(),

const std::string& address = "00:00:00:00:00:00");

@@ -433,7 +433,7 @@ class LayoutTestBluetoothAdapterProvider {

static std::unique_ptr<testing::NiceMock<device::MockBluetoothDevice>>

GetConnectableDevice(

device::MockBluetoothAdapter* adapter,

- const std::string& device_name = "Connectable Device",

+ const char* device_name = "Connectable Device",

device::BluetoothDevice::UUIDList = device::BluetoothDevice::UUIDList(),

const std::string& address = "00:00:00:00:00:00");

@@ -447,10 +447,9 @@ class LayoutTestBluetoothAdapterProvider {

// - CreateGATTConnection:

// - Run error callback with error_type

static std::unique_ptr<testing::NiceMock<device::MockBluetoothDevice>>

- GetUnconnectableDevice(

- device::MockBluetoothAdapter* adapter,

- device::BluetoothDevice::ConnectErrorCode error_code,

- const std::string& device_name = "Unconnectable Device");

+ GetUnconnectableDevice(device::MockBluetoothAdapter* adapter,

+ device::BluetoothDevice::ConnectErrorCode error_code,

+ const char* device_name = "Unconnectable Device");

// |HeartRateDevice|

// Inherits from |ConnectableDevice|(adapter, "Heart Rate Device", uuids)