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

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

Issue 2567903004: Replace ScopedVector/ScopedPtrHashMap with std::vector and std::unordered_map (Closed)
Patch Set: Mac bustage Created 3 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
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>
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 // *mock_service, 57 // *mock_service,
58 // &MockBluetoothGattService::GetMockCharacteristics)); 58 // &MockBluetoothGattService::GetMockCharacteristics));
59 void AddMockCharacteristic( 59 void AddMockCharacteristic(
60 std::unique_ptr<MockBluetoothGattCharacteristic> mock_characteristic); 60 std::unique_ptr<MockBluetoothGattCharacteristic> mock_characteristic);
61 std::vector<BluetoothRemoteGattCharacteristic*> GetMockCharacteristics() 61 std::vector<BluetoothRemoteGattCharacteristic*> GetMockCharacteristics()
62 const; 62 const;
63 BluetoothRemoteGattCharacteristic* GetMockCharacteristic( 63 BluetoothRemoteGattCharacteristic* GetMockCharacteristic(
64 const std::string& identifier) const; 64 const std::string& identifier) const;
65 65
66 private: 66 private:
67 ScopedVector<MockBluetoothGattCharacteristic> mock_characteristics_; 67 std::vector<std::unique_ptr<MockBluetoothGattCharacteristic>>
68 mock_characteristics_;
68 69
69 DISALLOW_COPY_AND_ASSIGN(MockBluetoothGattService); 70 DISALLOW_COPY_AND_ASSIGN(MockBluetoothGattService);
70 }; 71 };
71 72
72 } // namespace device 73 } // namespace device
73 74
74 #endif // DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_GATT_SERVICE_H_ 75 #endif // DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_GATT_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698