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

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

Issue 1874313002: Convert device to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 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/serial/serial_service_unittest.cc ('k') | device/test/usb_test_gadget.h » ('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 <memory>
6
5 #include "base/memory/ref_counted.h" 7 #include "base/memory/ref_counted.h"
6 #include "base/memory/scoped_ptr.h"
7 #include "device/core/device_client.h" 8 #include "device/core/device_client.h"
8 9
9 namespace base { 10 namespace base {
10 class SingleThreadTaskRunner; 11 class SingleThreadTaskRunner;
11 } 12 }
12 13
13 namespace device { 14 namespace device {
14 15
15 class HidService; 16 class HidService;
16 class UsbService; 17 class UsbService;
17 18
18 class TestDeviceClient : public DeviceClient { 19 class TestDeviceClient : public DeviceClient {
19 public: 20 public:
20 TestDeviceClient(scoped_refptr<base::SingleThreadTaskRunner> task_runner); 21 TestDeviceClient(scoped_refptr<base::SingleThreadTaskRunner> task_runner);
21 ~TestDeviceClient() override; 22 ~TestDeviceClient() override;
22 23
23 private: 24 private:
24 HidService* GetHidService() override; 25 HidService* GetHidService() override;
25 UsbService* GetUsbService() override; 26 UsbService* GetUsbService() override;
26 27
27 scoped_ptr<HidService> hid_service_; 28 std::unique_ptr<HidService> hid_service_;
28 scoped_ptr<UsbService> usb_service_; 29 std::unique_ptr<UsbService> usb_service_;
29 scoped_refptr<base::SingleThreadTaskRunner> blocking_task_runner_; 30 scoped_refptr<base::SingleThreadTaskRunner> blocking_task_runner_;
30 }; 31 };
31 32
32 } // namespace device 33 } // namespace device
OLDNEW
« no previous file with comments | « device/serial/serial_service_unittest.cc ('k') | device/test/usb_test_gadget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698