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

Side by Side Diff: device/test/test_device_client.cc

Issue 1542163002: Switch to standard integer types in device/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: win Created 4 years, 12 months 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/test/run_all_unittests.cc ('k') | device/test/usb_test_gadget_impl.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 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
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
OLDNEW
« no previous file with comments | « device/test/run_all_unittests.cc ('k') | device/test/usb_test_gadget_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698