Migrate HidServiceLinux and HidConnectionLinux to BrowserThread::UI.

device/hid/hid_service.cc

 // 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 "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"
 
 #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"
 #else
 #include "device/hid/hid_service_win.h"
 #endif
@@ skipping 18 matching lines @@
     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) {
+    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)
     g_service = new HidServiceWin();
 #endif
     if (g_service != nullptr) {
       Destroyer* destroyer = new Destroyer(g_service);
       base::MessageLoop::current()->AddDestructionObserver(destroyer);
     }
   }
   return g_service;
 }
 
 void HidService::SetInstanceForTest(HidService* instance) {
   DCHECK(!g_service);
   g_service = instance;
   Destroyer* destroyer = new Destroyer(g_service);
   base::MessageLoop::current()->AddDestructionObserver(destroyer);
 }
 
 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 this DCHECK in its own
destructor. This is only the case for base::NonThreadSafe. The DCHECK in the
HidService constructor is truly redundant.

 }
 
 void HidService::GetDevices(std::vector<HidDeviceInfo>* devices) {
   DCHECK(thread_checker_.CalledOnValidThread());
   STLClearObject(devices);
   for (DeviceMap::iterator it = devices_.begin();
       it != devices_.end();
       ++it) {
     devices->push_back(it->second);
   }
 }
 
 // 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;
   *info = it->second;
   return true;
 }
 
 HidService::HidService() {
-  DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 void HidService::AddDevice(const HidDeviceInfo& info) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!ContainsKey(devices_, info.device_id)) {
     devices_[info.device_id] = info;
   }
 }
 
 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