Update To 11.40.268.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 973e901..071b396 100644 (file)
--- a/src/device/hid/hid_service.cc
+++ b/src/device/hid/hid_service.cc
@@ -1,20 +1,16 @@
-// Copyright (c) 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/hid/hid_service.h"
 
-#include <vector>
-
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
-#include "base/threading/thread_restrictions.h"
-#include "build/build_config.h"
-#include "device/hid/hid_device_info.h"
+#include "base/stl_util.h"
 
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && defined(USE_UDEV)
 #include "device/hid/hid_service_linux.h"
 #elif defined(OS_MACOSX)
 #include "device/hid/hid_service_mac.h"
@@ -26,26 +22,56 @@ 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* g_service = NULL;
 
 }  // namespace
 
-HidService::HidService() : initialized_(false) {
-  base::ThreadRestrictions::AssertIOAllowed();
-  DCHECK(thread_checker_.CalledOnValidThread());
-  base::MessageLoop::current()->AddDestructionObserver(this);
+class HidService::Destroyer : public base::MessageLoop::DestructionObserver {
+ public:
+  explicit Destroyer(HidService* hid_service)
+      : hid_service_(hid_service) {}
+  ~Destroyer() override {}
+
+ private:
+  // base::MessageLoop::DestructionObserver implementation.
+  void WillDestroyCurrentMessageLoop() override {
+    base::MessageLoop::current()->RemoveDestructionObserver(this);
+    delete hid_service_;
+    delete this;
+    g_service = NULL;
+  }
+
+  HidService* hid_service_;
+};
+
+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(file_task_runner);
+#elif defined(OS_WIN)
+    g_service = new HidServiceWin();
+#endif
+    if (g_service != nullptr) {
+      Destroyer* destroyer = new Destroyer(g_service);
+      base::MessageLoop::current()->AddDestructionObserver(destroyer);
+    }
+  }
+  return g_service;
 }
 
-HidService::~HidService() {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  base::MessageLoop::current()->RemoveDestructionObserver(this);
+void HidService::SetInstanceForTest(HidService* instance) {
+  DCHECK(!g_service);
+  g_service = instance;
+  Destroyer* destroyer = new Destroyer(g_service);
+  base::MessageLoop::current()->AddDestructionObserver(destroyer);
 }
 
-void HidService::WillDestroyCurrentMessageLoop() {
+HidService::~HidService() {
   DCHECK(thread_checker_.CalledOnValidThread());
-  g_hid_service_ptr.Get().reset(NULL);
 }
 
 void HidService::GetDevices(std::vector<HidDeviceInfo>* devices) {
@@ -59,7 +85,8 @@ void HidService::GetDevices(std::vector<HidDeviceInfo>* devices) {
 }
 
 // Fills in the device info struct of the given device_id.
-bool HidService::GetInfo(std::string device_id, HidDeviceInfo* info) const {
+bool HidService::GetDeviceInfo(const HidDeviceId& device_id,
+                               HidDeviceInfo* info) const {
   DeviceMap::const_iterator it = devices_.find(device_id);
   if (it == devices_.end())
     return false;
@@ -67,40 +94,22 @@ bool HidService::GetInfo(std::string device_id, HidDeviceInfo* info) const {
   return true;
 }
 
-void HidService::AddDevice(HidDeviceInfo info) {
-  if (!ContainsKey(devices_, info.device_id)) {
-    DCHECK(thread_checker_.CalledOnValidThread());
-    devices_[info.device_id] = info;
-  }
+HidService::HidService() {
+  DCHECK(thread_checker_.CalledOnValidThread());
 }
 
-void HidService::RemoveDevice(std::string device_id) {
-  if (ContainsKey(devices_, device_id)) {
-    DCHECK(thread_checker_.CalledOnValidThread());
-    devices_.erase(device_id);
+void HidService::AddDevice(const HidDeviceInfo& info) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  if (!ContainsKey(devices_, info.device_id)) {
+    devices_[info.device_id] = info;
   }
 }
 
-HidService* HidService::CreateInstance() {
-#if defined(OS_LINUX)
-    return new HidServiceLinux();
-#elif defined(OS_MACOSX)
-    return new HidServiceMac();
-#elif defined(OS_WIN)
-    return new HidServiceWin();
-#else
-    return NULL;
-#endif
-}
-
-HidService* HidService::GetInstance() {
-  if (!g_hid_service_ptr.Get().get()){
-    scoped_ptr<HidService> service(CreateInstance());
-
-    if (service && service->initialized())
-      g_hid_service_ptr.Get().reset(service.release());
-  }
-  return g_hid_service_ptr.Get().get();
+void HidService::RemoveDevice(const HidDeviceId& device_id) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  DeviceMap::iterator it = devices_.find(device_id);
+  if (it != devices_.end())
+    devices_.erase(it);
 }
 
 }  // namespace device