device/bluetooth/test/mock_bluetooth_device.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: device/bluetooth/test/mock_bluetooth_device.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 | « content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc ('k') | device/bluetooth/test/mock_bluetooth_device.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/test/mock_bluetooth_device.h

diff --git a/device/bluetooth/test/mock_bluetooth_device.h b/device/bluetooth/test/mock_bluetooth_device.h

index e464ac20204dc3ba618c281779d85f402fa018cb..a7ed03ab37cecceb288d769fda128b199e88c0e1 100644

--- a/device/bluetooth/test/mock_bluetooth_device.h

+++ b/device/bluetooth/test/mock_bluetooth_device.h

@@ -11,6 +11,7 @@

#include <string>

#include "base/memory/scoped_vector.h"

+#include "base/optional.h"

#include "base/strings/string16.h"

#include "device/bluetooth/bluetooth_common.h"

#include "device/bluetooth/bluetooth_device.h"

@@ -27,7 +28,7 @@ class MockBluetoothDevice : public BluetoothDevice {

public:

MockBluetoothDevice(MockBluetoothAdapter* adapter,

uint32_t bluetooth_class,

- const std::string& name,

+ const char* name,

const std::string& address,

bool paired,

bool connected);

@@ -117,7 +118,7 @@ class MockBluetoothDevice : public BluetoothDevice {

private:

uint32_t bluetooth_class_;

- std::string name_;

+ base::Optional<std::string> name_;

std::string address_;

BluetoothDevice::UUIDList uuids_;

bool connected_;