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

Side by Side Diff: device/bluetooth/test/mock_bluetooth_gatt_service.h

Issue 2614753004: Remove ScopedVector from bluetooth. (Closed)
Patch Set: last win bits Created 3 years, 11 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
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 #ifndef DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_GATT_SERVICE_H_ 5 #ifndef DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_GATT_SERVICE_H_
6 #define DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_GATT_SERVICE_H_ 6 #define DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_GATT_SERVICE_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/scoped_vector.h"
14 #include "device/bluetooth/bluetooth_remote_gatt_service.h" 13 #include "device/bluetooth/bluetooth_remote_gatt_service.h"
15 #include "device/bluetooth/bluetooth_uuid.h" 14 #include "device/bluetooth/bluetooth_uuid.h"
16 #include "device/bluetooth/test/mock_bluetooth_gatt_characteristic.h" 15 #include "device/bluetooth/test/mock_bluetooth_gatt_characteristic.h"
17 #include "testing/gmock/include/gmock/gmock.h" 16 #include "testing/gmock/include/gmock/gmock.h"
18 17
19 namespace device { 18 namespace device {
20 19
21 class BluetoothRemoteGattCharacteristic; 20 class BluetoothRemoteGattCharacteristic;
22 class MockBluetoothDevice; 21 class MockBluetoothDevice;
23 22
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 // *mock_service, 56 // *mock_service,
58 // &MockBluetoothGattService::GetMockCharacteristics)); 57 // &MockBluetoothGattService::GetMockCharacteristics));
59 void AddMockCharacteristic( 58 void AddMockCharacteristic(
60 std::unique_ptr<MockBluetoothGattCharacteristic> mock_characteristic); 59 std::unique_ptr<MockBluetoothGattCharacteristic> mock_characteristic);
61 std::vector<BluetoothRemoteGattCharacteristic*> GetMockCharacteristics() 60 std::vector<BluetoothRemoteGattCharacteristic*> GetMockCharacteristics()
62 const; 61 const;
63 BluetoothRemoteGattCharacteristic* GetMockCharacteristic( 62 BluetoothRemoteGattCharacteristic* GetMockCharacteristic(
64 const std::string& identifier) const; 63 const std::string& identifier) const;
65 64
66 private: 65 private:
67 ScopedVector<MockBluetoothGattCharacteristic> mock_characteristics_; 66 std::vector<std::unique_ptr<MockBluetoothGattCharacteristic>>
67 mock_characteristics_;
68 68
69 DISALLOW_COPY_AND_ASSIGN(MockBluetoothGattService); 69 DISALLOW_COPY_AND_ASSIGN(MockBluetoothGattService);
70 }; 70 };
71 71
72 } // namespace device 72 } // namespace device
73 73
74 #endif // DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_GATT_SERVICE_H_ 74 #endif // DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_GATT_SERVICE_H_
OLDNEW
« no previous file with comments | « device/bluetooth/test/mock_bluetooth_device.cc ('k') | device/bluetooth/test/mock_bluetooth_gatt_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698