Index: device/hid/hid_service.cc |
diff --git a/device/hid/hid_service.cc b/device/hid/hid_service.cc |
index 071b3968bcd7fdcd21079e58c5226695eb84d72a..674ab9724da96de48e0c230e84a2b8addd3992d5 100644 |
--- a/device/hid/hid_service.cc |
+++ b/device/hid/hid_service.cc |
@@ -4,9 +4,7 @@ |
#include "device/hid/hid_service.h" |
-#include "base/lazy_instance.h" |
#include "base/logging.h" |
-#include "base/memory/scoped_vector.h" |
#include "base/message_loop/message_loop.h" |
#include "base/stl_util.h" |
@@ -45,11 +43,10 @@ class HidService::Destroyer : public base::MessageLoop::DestructionObserver { |
}; |
HidService* HidService::GetInstance( |
- scoped_refptr<base::SingleThreadTaskRunner> file_task_runner, |
- scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { |
+ scoped_refptr<base::SingleThreadTaskRunner> file_task_runner) { |
if (g_service == NULL) { |
#if defined(OS_LINUX) && defined(USE_UDEV) |
- g_service = new HidServiceLinux(ui_task_runner); |
+ g_service = new HidServiceLinux(file_task_runner); |
#elif defined(OS_MACOSX) |
g_service = new HidServiceMac(file_task_runner); |
#elif defined(OS_WIN) |
@@ -71,7 +68,6 @@ void HidService::SetInstanceForTest(HidService* instance) { |
} |
HidService::~HidService() { |
- DCHECK(thread_checker_.CalledOnValidThread()); |
Ken Rockot(use gerrit already)
2014/12/03 22:35:10
Why do we want to remove this one?
Reilly Grant (use Gerrit)
2014/12/03 23:10:28
I mistakenly recalled that base::ThreadChecker has
|
} |
void HidService::GetDevices(std::vector<HidDeviceInfo>* devices) { |
@@ -87,6 +83,7 @@ void HidService::GetDevices(std::vector<HidDeviceInfo>* devices) { |
// Fills in the device info struct of the given device_id. |
bool HidService::GetDeviceInfo(const HidDeviceId& device_id, |
HidDeviceInfo* info) const { |
+ DCHECK(thread_checker_.CalledOnValidThread()); |
DeviceMap::const_iterator it = devices_.find(device_id); |
if (it == devices_.end()) |
return false; |
@@ -95,7 +92,6 @@ bool HidService::GetDeviceInfo(const HidDeviceId& device_id, |
} |
HidService::HidService() { |
- DCHECK(thread_checker_.CalledOnValidThread()); |
} |
void HidService::AddDevice(const HidDeviceInfo& info) { |