content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc - 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.cc

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 | « content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h ('k') | device/bluetooth/test/mock_bluetooth_device.h » ('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.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 6f6420b43cda230ad9bfef33c56c2f8caa4f2f7d..1781dcd851f67c269686daadef3de27b378b4396 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

@@ -708,7 +708,7 @@ LayoutTestBluetoothAdapterProvider::GetDiscoverySession() {

std::unique_ptr<NiceMockBluetoothDevice>

LayoutTestBluetoothAdapterProvider::GetBaseDevice(

MockBluetoothAdapter* adapter,

- const std::string& device_name,

+ const char* device_name,

device::BluetoothDevice::UUIDList uuids,

const std::string& address) {

std::unique_ptr<NiceMockBluetoothDevice> device(new NiceMockBluetoothDevice(

@@ -764,7 +764,7 @@ LayoutTestBluetoothAdapterProvider::GetGlucoseDevice(

std::unique_ptr<NiceMockBluetoothDevice>

LayoutTestBluetoothAdapterProvider::GetConnectableDevice(

device::MockBluetoothAdapter* adapter,

- const std::string& device_name,

+ const char* device_name,

BluetoothDevice::UUIDList uuids,

const std::string& address) {

std::unique_ptr<NiceMockBluetoothDevice> device(

@@ -790,7 +790,7 @@ std::unique_ptr<NiceMockBluetoothDevice>

LayoutTestBluetoothAdapterProvider::GetUnconnectableDevice(

MockBluetoothAdapter* adapter,

BluetoothDevice::ConnectErrorCode error_code,

- const std::string& device_name) {

+ const char* device_name) {

BluetoothDevice::UUIDList uuids;

uuids.push_back(BluetoothUUID(errorUUID(error_code)));