| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/test/test_device_client.h" | 5 #include "device/test/test_device_client.h" |
| 6 | 6 |
| 7 #include "build/build_config.h" |
| 8 |
| 7 // This file unconditionally includes these headers despite conditionally | 9 // This file unconditionally includes these headers despite conditionally |
| 8 // depending on the corresponding targets. The code below needs the destructors | 10 // depending on the corresponding targets. The code below needs the destructors |
| 9 // of the classes defined even when the classes are never instantiated. | 11 // of the classes defined even when the classes are never instantiated. |
| 10 // TODO: This should probably be done more explicitly to avoid ambiguity. | 12 // TODO: This should probably be done more explicitly to avoid ambiguity. |
| 11 #include "device/hid/hid_service.h" // nogncheck | 13 #include "device/hid/hid_service.h" // nogncheck |
| 12 #include "device/usb/usb_service.h" // nogncheck | 14 #include "device/usb/usb_service.h" // nogncheck |
| 13 | 15 |
| 14 namespace device { | 16 namespace device { |
| 15 | 17 |
| 16 TestDeviceClient::TestDeviceClient( | 18 TestDeviceClient::TestDeviceClient( |
| (...skipping 15 matching lines...) Expand all Loading... |
| 32 UsbService* TestDeviceClient::GetUsbService() { | 34 UsbService* TestDeviceClient::GetUsbService() { |
| 33 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 35 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 34 if (!usb_service_) { | 36 if (!usb_service_) { |
| 35 usb_service_ = UsbService::Create(blocking_task_runner_); | 37 usb_service_ = UsbService::Create(blocking_task_runner_); |
| 36 } | 38 } |
| 37 #endif | 39 #endif |
| 38 return usb_service_.get(); | 40 return usb_service_.get(); |
| 39 } | 41 } |
| 40 | 42 |
| 41 } // namespace device | 43 } // namespace device |
| OLD | NEW |