diff options
author | reillyg <reillyg@chromium.org> | 2014-10-30 11:42:10 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-30 18:42:28 +0000 |
commit | e48477cd0a73dce8d17a2a6290434602252d6ba6 (patch) | |
tree | 0b8a48afdc2356be7cc86926151360f668a556bc /device/hid/hid_service.cc | |
parent | 2dc842c7481b6cc806bcd7b8cd027e496853149f (diff) | |
download | chromium_src-e48477cd0a73dce8d17a2a6290434602252d6ba6.zip chromium_src-e48477cd0a73dce8d17a2a6290434602252d6ba6.tar.gz chromium_src-e48477cd0a73dce8d17a2a6290434602252d6ba6.tar.bz2 |
Add API tests for the chrome.hid API.
These test validate that the implementation of the chrome.hid API is using
the API provided by //device/hid correctly. It does not talk to real devices
or validate platform-specific functionality.
BUG=
Review URL: https://codereview.chromium.org/690473002
Cr-Commit-Position: refs/heads/master@{#302117}
Diffstat (limited to 'device/hid/hid_service.cc')
-rw-r--r-- | device/hid/hid_service.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/device/hid/hid_service.cc b/device/hid/hid_service.cc index d2ccaa3..071b396 100644 --- a/device/hid/hid_service.cc +++ b/device/hid/hid_service.cc @@ -55,7 +55,7 @@ HidService* HidService::GetInstance( #elif defined(OS_WIN) g_service = new HidServiceWin(); #endif - if (g_service != NULL) { + if (g_service != nullptr) { Destroyer* destroyer = new Destroyer(g_service); base::MessageLoop::current()->AddDestructionObserver(destroyer); } @@ -63,6 +63,13 @@ HidService* HidService::GetInstance( return g_service; } +void HidService::SetInstanceForTest(HidService* instance) { + DCHECK(!g_service); + g_service = instance; + Destroyer* destroyer = new Destroyer(g_service); + base::MessageLoop::current()->AddDestructionObserver(destroyer); +} + HidService::~HidService() { DCHECK(thread_checker_.CalledOnValidThread()); } |