Upstream version 9.38.198.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 4d24b00..0e2f0d4 100644 (file)
--- a/src/device/hid/hid_service.cc
+++ b/src/device/hid/hid_service.cc
@@ -20,13 +20,22 @@
 
 namespace device {
 
-namespace {
-
-// The instance will be reset when message loop destroys.
-base::LazyInstance<scoped_ptr<HidService> >::Leaky g_hid_service_ptr =
-    LAZY_INSTANCE_INITIALIZER;
+HidService* HidService::Create(
+    scoped_refptr<base::MessageLoopProxy> ui_message_loop) {
+#if defined(OS_LINUX) && defined(USE_UDEV)
+  return new HidServiceLinux(ui_message_loop);
+#elif defined(OS_MACOSX)
+  return new HidServiceMac();
+#elif defined(OS_WIN)
+  return new HidServiceWin();
+#else
+  return NULL;
+#endif
+}
 
-}  // namespace
+HidService::~HidService() {
+  DCHECK(thread_checker_.CalledOnValidThread());
+}
 
 void HidService::GetDevices(std::vector<HidDeviceInfo>* devices) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ -48,32 +57,9 @@ bool HidService::GetDeviceInfo(const HidDeviceId& device_id,
   return true;
 }
 
-void HidService::WillDestroyCurrentMessageLoop() {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  g_hid_service_ptr.Get().reset(NULL);
-}
-
 HidService::HidService() {
   base::ThreadRestrictions::AssertIOAllowed();
   DCHECK(thread_checker_.CalledOnValidThread());
-  base::MessageLoop::current()->AddDestructionObserver(this);
-}
-
-HidService::~HidService() {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  base::MessageLoop::current()->RemoveDestructionObserver(this);
-}
-
-HidService* HidService::CreateInstance() {
-#if defined(OS_LINUX) && defined(USE_UDEV)
-    return new HidServiceLinux();
-#elif defined(OS_MACOSX)
-    return new HidServiceMac();
-#elif defined(OS_WIN)
-    return new HidServiceWin();
-#else
-    return NULL;
-#endif
 }
 
 void HidService::AddDevice(const HidDeviceInfo& info) {
@@ -90,10 +76,8 @@ void HidService::RemoveDevice(const HidDeviceId& device_id) {
     devices_.erase(it);
 }
 
-HidService* HidService::GetInstance() {
-  if (!g_hid_service_ptr.Get().get())
-    g_hid_service_ptr.Get().reset(CreateInstance());
-  return g_hid_service_ptr.Get().get();
+const HidService::DeviceMap& HidService::GetDevicesNoEnumerate() const {
+  return devices_;
 }
 
 }  // namespace device