Fix HidService lifetime issues.

extensions/browser/api/hid/hid_device_manager.cc

Index: extensions/browser/api/hid/hid_device_manager.cc
diff --git a/extensions/browser/api/hid/hid_device_manager.cc b/extensions/browser/api/hid/hid_device_manager.cc
index 4992f05d595d28f48ee4533a94e46c097f82973f..1356add6aed4e860b3c0406325cb7196ca468253 100644
--- a/extensions/browser/api/hid/hid_device_manager.cc
+++ b/extensions/browser/api/hid/hid_device_manager.cc
@@ -8,8 +8,8 @@
 #include <vector>
 
 #include "base/lazy_instance.h"
+#include "content/public/browser/browser_thread.h"
 #include "device/hid/hid_service.h"
-#include "extensions/browser/api/extensions_api_client.h"
 
 using device::HidService;
 using device::HidUsageAndPage;
@@ -17,7 +17,10 @@ using device::HidUsageAndPage;
 namespace extensions {
 
 HidDeviceManager::HidDeviceManager(content::BrowserContext* context)
-  : next_resource_id_(0) {}
+    : next_resource_id_(0),
+      ui_message_loop_(content::BrowserThread::GetMessageLoopProxyForThread(
+          content::BrowserThread::UI)) {
+}
 
 HidDeviceManager::~HidDeviceManager() {}
 
@@ -34,7 +37,7 @@ scoped_ptr<base::ListValue> HidDeviceManager::GetApiDevices(
     uint16_t product_id) {
   UpdateDevices();
 
-  HidService* hid_service = ExtensionsAPIClient::Get()->GetHidService();
+  HidService* hid_service = HidService::GetInstance(ui_message_loop_);
   DCHECK(hid_service);
   base::ListValue* api_devices = new base::ListValue();
   for (ResourceIdToDeviceIdMap::const_iterator device_iter =
@@ -97,7 +100,7 @@ scoped_ptr<base::ListValue> HidDeviceManager::GetApiDevices(
 bool HidDeviceManager::GetDeviceInfo(int resource_id,
                                      device::HidDeviceInfo* device_info) {
   UpdateDevices();
-  HidService* hid_service = ExtensionsAPIClient::Get()->GetHidService();
+  HidService* hid_service = HidService::GetInstance(ui_message_loop_);
   DCHECK(hid_service);
 
   ResourceIdToDeviceIdMap::const_iterator device_iter =
@@ -110,7 +113,7 @@ bool HidDeviceManager::GetDeviceInfo(int resource_id,
 
 void HidDeviceManager::UpdateDevices() {
   thread_checker_.CalledOnValidThread();
-  HidService* hid_service = ExtensionsAPIClient::Get()->GetHidService();
+  HidService* hid_service = HidService::GetInstance(ui_message_loop_);
   DCHECK(hid_service);
 
   std::vector<device::HidDeviceInfo> devices;