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

Unified Diff: chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc

Issue 2310683002: Remove most ScopedVector usage from c/b/extensions. (Closed)
Patch Set: remove scoped_vector includes Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc
diff --git a/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc b/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc
index 9396b873a6398d5e6e6cc83bef593da688818632..61a441b0252c5a8f7cacd1264a2775b96e4f054e 100644
--- a/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc
+++ b/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc
@@ -8,7 +8,7 @@
#include <string>
#include "base/guid.h"
-#include "base/memory/scoped_vector.h"
+#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "components/sync/device_info/device_info.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -30,25 +30,19 @@ bool VerifyDictionary(
}
TEST(IdMappingHelperTest, SetIdsForDevices) {
- ScopedVector<DeviceInfo> devices;
-
- devices.push_back(new DeviceInfo(base::GenerateGUID(),
- "abc Device",
- "XYZ v1",
- "XYZ SyncAgent v1",
- sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
- "device_id1"));
-
- devices.push_back(new DeviceInfo(base::GenerateGUID(),
- "def Device",
- "XYZ v1",
- "XYZ SyncAgent v1",
- sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
- "device_id2"));
+ std::vector<std::unique_ptr<DeviceInfo>> devices;
+
+ devices.push_back(base::MakeUnique<DeviceInfo>(
+ base::GenerateGUID(), "abc Device", "XYZ v1", "XYZ SyncAgent v1",
+ sync_pb::SyncEnums_DeviceType_TYPE_LINUX, "device_id1"));
+
+ devices.push_back(base::MakeUnique<DeviceInfo>(
+ base::GenerateGUID(), "def Device", "XYZ v1", "XYZ SyncAgent v1",
+ sync_pb::SyncEnums_DeviceType_TYPE_LINUX, "device_id2"));
base::DictionaryValue dictionary;
- CreateMappingForUnmappedDevices(&(devices.get()), &dictionary);
+ CreateMappingForUnmappedDevices(devices, &dictionary);
std::string public_id1 = devices[0]->public_id();
std::string public_id2 = devices[1]->public_id();
@@ -59,14 +53,11 @@ TEST(IdMappingHelperTest, SetIdsForDevices) {
EXPECT_NE(public_id1, public_id2);
// Now add a third device.
- devices.push_back(new DeviceInfo(base::GenerateGUID(),
- "ghi Device",
- "XYZ v1",
- "XYZ SyncAgent v1",
- sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
- "device_id3"));
-
- CreateMappingForUnmappedDevices(&(devices.get()), &dictionary);
+ devices.push_back(base::MakeUnique<DeviceInfo>(
+ base::GenerateGUID(), "ghi Device", "XYZ v1", "XYZ SyncAgent v1",
+ sync_pb::SyncEnums_DeviceType_TYPE_LINUX, "device_id3"));
+
+ CreateMappingForUnmappedDevices(devices, &dictionary);
// Now make sure the existing ids are not changed.
EXPECT_EQ(public_id1, devices[0]->public_id());

Powered by Google App Engine
This is Rietveld 408576698