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

Unified Diff: components/sync/device_info/device_info_service_unittest.cc

Issue 2310683002: Remove most ScopedVector usage from c/b/extensions. (Closed)
Patch Set: cleaned up 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: components/sync/device_info/device_info_service_unittest.cc
diff --git a/components/sync/device_info/device_info_service_unittest.cc b/components/sync/device_info/device_info_service_unittest.cc
index a87da1c7e1c2a176c27a6c00ca7375270f33087d..ef911c623d2382a0c3e14524359e51bef8933562 100644
--- a/components/sync/device_info/device_info_service_unittest.cc
+++ b/components/sync/device_info/device_info_service_unittest.cc
@@ -52,6 +52,7 @@ using sync_pb::DataTypeState;
using sync_pb::DeviceInfoSpecifics;
using sync_pb::EntitySpecifics;
+using DeviceInfoList = std::vector<std::unique_ptr<DeviceInfo>>;
using StorageKeyList = ModelTypeService::StorageKeyList;
using RecordList = ModelTypeStore::RecordList;
using Result = ModelTypeStore::Result;
@@ -345,7 +346,7 @@ TEST_F(DeviceInfoServiceTest, EmptyDataReconciliation) {
InitializeAndPump();
ASSERT_EQ(0u, service()->GetAllDeviceInfo().size());
OnSyncStarting();
- ScopedVector<DeviceInfo> all_device_info(service()->GetAllDeviceInfo());
+ DeviceInfoList all_device_info(service()->GetAllDeviceInfo());
ASSERT_EQ(1u, all_device_info.size());
ASSERT_TRUE(
local_device()->GetLocalDeviceInfo()->Equals(*all_device_info[0]));
@@ -356,7 +357,7 @@ TEST_F(DeviceInfoServiceTest, EmptyDataReconciliationSlowLoad) {
OnSyncStarting();
ASSERT_EQ(0u, service()->GetAllDeviceInfo().size());
base::RunLoop().RunUntilIdle();
- ScopedVector<DeviceInfo> all_device_info(service()->GetAllDeviceInfo());
+ DeviceInfoList all_device_info(service()->GetAllDeviceInfo());
ASSERT_EQ(1u, all_device_info.size());
ASSERT_TRUE(
local_device()->GetLocalDeviceInfo()->Equals(*all_device_info[0]));
@@ -370,7 +371,7 @@ TEST_F(DeviceInfoServiceTest, LocalProviderSubscription) {
local_device()->Initialize(CreateDeviceInfo());
base::RunLoop().RunUntilIdle();
- ScopedVector<DeviceInfo> all_device_info(service()->GetAllDeviceInfo());
+ DeviceInfoList all_device_info(service()->GetAllDeviceInfo());
ASSERT_EQ(1u, all_device_info.size());
ASSERT_TRUE(
local_device()->GetLocalDeviceInfo()->Equals(*all_device_info[0]));
@@ -387,7 +388,7 @@ TEST_F(DeviceInfoServiceTest, LocalProviderInitRace) {
local_device()->Initialize(CreateDeviceInfo());
base::RunLoop().RunUntilIdle();
- ScopedVector<DeviceInfo> all_device_info(service()->GetAllDeviceInfo());
+ DeviceInfoList all_device_info(service()->GetAllDeviceInfo());
ASSERT_EQ(1u, all_device_info.size());
ASSERT_TRUE(
local_device()->GetLocalDeviceInfo()->Equals(*all_device_info[0]));
@@ -424,7 +425,7 @@ TEST_F(DeviceInfoServiceTest, TestWithLocalData) {
InitializeAndPump();
- ScopedVector<DeviceInfo> all_device_info(service()->GetAllDeviceInfo());
+ DeviceInfoList all_device_info(service()->GetAllDeviceInfo());
ASSERT_EQ(1u, all_device_info.size());
AssertEqual(specifics, *all_device_info[0]);
AssertEqual(specifics,
@@ -439,7 +440,7 @@ TEST_F(DeviceInfoServiceTest, TestWithLocalMetadata) {
store()->CommitWriteBatch(std::move(batch),
base::Bind(&AssertResultIsSuccess));
InitializeAndPump();
- ScopedVector<DeviceInfo> all_device_info(service()->GetAllDeviceInfo());
+ DeviceInfoList all_device_info(service()->GetAllDeviceInfo());
ASSERT_EQ(1u, all_device_info.size());
ASSERT_TRUE(
local_device()->GetLocalDeviceInfo()->Equals(*all_device_info[0]));
@@ -459,7 +460,7 @@ TEST_F(DeviceInfoServiceTest, TestWithLocalDataAndMetadata) {
InitializeAndPump();
- ScopedVector<DeviceInfo> all_device_info(service()->GetAllDeviceInfo());
+ DeviceInfoList all_device_info(service()->GetAllDeviceInfo());
ASSERT_EQ(2u, all_device_info.size());
AssertEqual(specifics,
*service()->GetDeviceInfo(specifics.cache_guid()).get());

Powered by Google App Engine
This is Rietveld 408576698