device/test/test_device_client.cc - Issue 1312993008: Manage HidService lifetime in DeviceClient implementations.

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/test/test_device_client.cc

Issue 1312993008: Manage HidService lifetime in DeviceClient implementations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_usb_service_get_instance

Patch Set: Created 5 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

Index: device/test/test_device_client.cc

diff --git a/device/test/test_device_client.cc b/device/test/test_device_client.cc

index fcfbf9285b7290f012919107200b97a4462308a8..f380c2cd04bcf6b83c72e009aab18a7ebf7ca2cb 100644

--- a/device/test/test_device_client.cc

+++ b/device/test/test_device_client.cc

@@ -16,11 +16,13 @@ TestDeviceClient::TestDeviceClient(

TestDeviceClient::~TestDeviceClient() {}

HidService* TestDeviceClient::GetHidService() {

-#if !defined(OS_LINUX) || defined(USE_UDEV)

- return HidService::GetInstance(blocking_task_runner_);

-#else

- return nullptr;

+#if !defined(OS_ANDROID) && !defined(OS_IOS) && \

+ !(defined(OS_LINUX) && !defined(USE_UDEV))

+ if (!hid_service_) {

+ hid_service_ = HidService::Create(blocking_task_runner_);

+ }

#endif

+ return hid_service_.get();

}

UsbService* TestDeviceClient::GetUsbService() {

« no previous file with comments | « device/test/test_device_client.h ('k') | extensions/browser/api/hid/hid_apitest.cc » ('j') | no next file with comments »