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

Side by Side Diff: device/usb/mojo/device_manager_impl_unittest.cc

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/usb/mojo/device_manager_impl.cc ('k') | device/usb/usb_context.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 "device/usb/mojo/device_manager_impl.h" 5 #include "device/usb/mojo/device_manager_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8
9 #include <memory>
8 #include <set> 10 #include <set>
9 #include <string> 11 #include <string>
10 #include <utility> 12 #include <utility>
11 13
12 #include "base/bind.h" 14 #include "base/bind.h"
13 #include "base/macros.h" 15 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h"
15 #include "base/message_loop/message_loop.h" 16 #include "base/message_loop/message_loop.h"
16 #include "base/run_loop.h" 17 #include "base/run_loop.h"
17 #include "base/thread_task_runner_handle.h" 18 #include "base/thread_task_runner_handle.h"
18 #include "device/core/mock_device_client.h" 19 #include "device/core/mock_device_client.h"
19 #include "device/usb/mock_usb_device.h" 20 #include "device/usb/mock_usb_device.h"
20 #include "device/usb/mock_usb_device_handle.h" 21 #include "device/usb/mock_usb_device_handle.h"
21 #include "device/usb/mock_usb_service.h" 22 #include "device/usb/mock_usb_service.h"
22 #include "device/usb/mojo/device_impl.h" 23 #include "device/usb/mojo/device_impl.h"
23 #include "device/usb/mojo/mock_permission_provider.h" 24 #include "device/usb/mojo/mock_permission_provider.h"
24 #include "testing/gtest/include/gtest/gtest.h" 25 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 16 matching lines...) Expand all
41 DeviceManagerPtr device_manager; 42 DeviceManagerPtr device_manager;
42 DeviceManagerImpl::Create(permission_provider_.GetWeakPtr(), 43 DeviceManagerImpl::Create(permission_provider_.GetWeakPtr(),
43 mojo::GetProxy(&device_manager)); 44 mojo::GetProxy(&device_manager));
44 return device_manager; 45 return device_manager;
45 } 46 }
46 47
47 MockDeviceClient device_client_; 48 MockDeviceClient device_client_;
48 49
49 private: 50 private:
50 MockPermissionProvider permission_provider_; 51 MockPermissionProvider permission_provider_;
51 scoped_ptr<base::MessageLoop> message_loop_; 52 std::unique_ptr<base::MessageLoop> message_loop_;
52 }; 53 };
53 54
54 void ExpectDevicesAndThen(const std::set<std::string>& expected_guids, 55 void ExpectDevicesAndThen(const std::set<std::string>& expected_guids,
55 const base::Closure& continuation, 56 const base::Closure& continuation,
56 mojo::Array<DeviceInfoPtr> results) { 57 mojo::Array<DeviceInfoPtr> results) {
57 EXPECT_EQ(expected_guids.size(), results.size()); 58 EXPECT_EQ(expected_guids.size(), results.size());
58 std::set<std::string> actual_guids; 59 std::set<std::string> actual_guids;
59 for (size_t i = 0; i < results.size(); ++i) 60 for (size_t i = 0; i < results.size(); ++i)
60 actual_guids.insert(results[i]->guid); 61 actual_guids.insert(results[i]->guid);
61 EXPECT_EQ(expected_guids, actual_guids); 62 EXPECT_EQ(expected_guids, actual_guids);
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 base::ThreadTaskRunnerHandle::Get()->PostTask( 223 base::ThreadTaskRunnerHandle::Get()->PostTask(
223 FROM_HERE, 224 FROM_HERE,
224 base::Bind(&MockUsbService::AddDevice, 225 base::Bind(&MockUsbService::AddDevice,
225 base::Unretained(device_client_.usb_service()), device0)); 226 base::Unretained(device_client_.usb_service()), device0));
226 loop.Run(); 227 loop.Run();
227 } 228 }
228 } 229 }
229 230
230 } // namespace usb 231 } // namespace usb
231 } // namespace device 232 } // namespace device
OLDNEW
« no previous file with comments | « device/usb/mojo/device_manager_impl.cc ('k') | device/usb/usb_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698