Upstream version 11.39.250.0

[platform/framework/web/crosswalk.git] / src / device / hid / hid_service.cc

diff --git a/src/device/hid/hid_service.cc b/src/device/hid/hid_service.cc
index 2dfdb89..f7a2b71 100644 (file)
--- a/src/device/hid/hid_service.cc
+++ b/src/device/hid/hid_service.cc
@@ -9,7 +9,6 @@
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
-#include "base/threading/thread_restrictions.h"
 
 #if defined(OS_LINUX) && defined(USE_UDEV)
 #include "device/hid/hid_service_linux.h"
@@ -46,12 +45,13 @@ class HidService::Destroyer : public base::MessageLoop::DestructionObserver {
 };
 
 HidService* HidService::GetInstance(
+    scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
   if (g_service == NULL) {
 #if defined(OS_LINUX) && defined(USE_UDEV)
     g_service = new HidServiceLinux(ui_task_runner);
 #elif defined(OS_MACOSX)
-    g_service = new HidServiceMac();
+    g_service = new HidServiceMac(file_task_runner);
 #elif defined(OS_WIN)
     g_service = new HidServiceWin();
 #endif
@@ -88,7 +88,6 @@ bool HidService::GetDeviceInfo(const HidDeviceId& device_id,
 }
 
 HidService::HidService() {
-  base::ThreadRestrictions::AssertIOAllowed();
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
@@ -106,8 +105,4 @@ void HidService::RemoveDevice(const HidDeviceId& device_id) {
     devices_.erase(it);
 }
 
-const HidService::DeviceMap& HidService::GetDevicesNoEnumerate() const {
-  return devices_;
-}
-
 }  // namespace device