Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(128)

Side by Side Diff: device/hid/hid_service.cc

Issue 690473002: Add API tests for the chrome.hid API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « device/hid/hid_service.h ('k') | extensions/browser/api/hid/hid_apitest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "device/hid/hid_service.h" 5 #include "device/hid/hid_service.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner, 48 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
49 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { 49 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
50 if (g_service == NULL) { 50 if (g_service == NULL) {
51 #if defined(OS_LINUX) && defined(USE_UDEV) 51 #if defined(OS_LINUX) && defined(USE_UDEV)
52 g_service = new HidServiceLinux(ui_task_runner); 52 g_service = new HidServiceLinux(ui_task_runner);
53 #elif defined(OS_MACOSX) 53 #elif defined(OS_MACOSX)
54 g_service = new HidServiceMac(file_task_runner); 54 g_service = new HidServiceMac(file_task_runner);
55 #elif defined(OS_WIN) 55 #elif defined(OS_WIN)
56 g_service = new HidServiceWin(); 56 g_service = new HidServiceWin();
57 #endif 57 #endif
58 if (g_service != NULL) { 58 if (g_service != nullptr) {
59 Destroyer* destroyer = new Destroyer(g_service); 59 Destroyer* destroyer = new Destroyer(g_service);
60 base::MessageLoop::current()->AddDestructionObserver(destroyer); 60 base::MessageLoop::current()->AddDestructionObserver(destroyer);
61 } 61 }
62 } 62 }
63 return g_service; 63 return g_service;
64 } 64 }
65 65
66 void HidService::SetInstanceForTest(HidService* instance) {
67 DCHECK(!g_service);
68 g_service = instance;
69 Destroyer* destroyer = new Destroyer(g_service);
70 base::MessageLoop::current()->AddDestructionObserver(destroyer);
71 }
72
66 HidService::~HidService() { 73 HidService::~HidService() {
67 DCHECK(thread_checker_.CalledOnValidThread()); 74 DCHECK(thread_checker_.CalledOnValidThread());
68 } 75 }
69 76
70 void HidService::GetDevices(std::vector<HidDeviceInfo>* devices) { 77 void HidService::GetDevices(std::vector<HidDeviceInfo>* devices) {
71 DCHECK(thread_checker_.CalledOnValidThread()); 78 DCHECK(thread_checker_.CalledOnValidThread());
72 STLClearObject(devices); 79 STLClearObject(devices);
73 for (DeviceMap::iterator it = devices_.begin(); 80 for (DeviceMap::iterator it = devices_.begin();
74 it != devices_.end(); 81 it != devices_.end();
75 ++it) { 82 ++it) {
(...skipping 23 matching lines...) Expand all
99 } 106 }
100 107
101 void HidService::RemoveDevice(const HidDeviceId& device_id) { 108 void HidService::RemoveDevice(const HidDeviceId& device_id) {
102 DCHECK(thread_checker_.CalledOnValidThread()); 109 DCHECK(thread_checker_.CalledOnValidThread());
103 DeviceMap::iterator it = devices_.find(device_id); 110 DeviceMap::iterator it = devices_.find(device_id);
104 if (it != devices_.end()) 111 if (it != devices_.end())
105 devices_.erase(it); 112 devices_.erase(it);
106 } 113 }
107 114
108 } // namespace device 115 } // namespace device
OLDNEW
« no previous file with comments | « device/hid/hid_service.h ('k') | extensions/browser/api/hid/hid_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698