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

Unified Diff: components/metrics/serialization/serialization_utils_unittest.cc

Issue 2691803002: Remove ScopedVector in //component/metrics (Closed)
Patch Set: code rebase Created 3 years, 10 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/metrics/serialization/serialization_utils_unittest.cc
diff --git a/components/metrics/serialization/serialization_utils_unittest.cc b/components/metrics/serialization/serialization_utils_unittest.cc
index 9d1e3602e34b4c89dea37fdb02e4cfed9b581223..3af04a6256614932e2e2ba2d1d685981de37f91e 100644
--- a/components/metrics/serialization/serialization_utils_unittest.cc
+++ b/components/metrics/serialization/serialization_utils_unittest.cc
@@ -128,10 +128,10 @@ TEST_F(SerializationUtilsTest, ReadLongMessageTest) {
std::unique_ptr<MetricSample> crash = MetricSample::CrashSample("test");
SerializationUtils::WriteMetricToFile(*crash.get(), filename);
- ScopedVector<MetricSample> samples;
+ std::vector<std::unique_ptr<MetricSample>> samples;
SerializationUtils::ReadAndTruncateMetricsFromFile(filename, &samples);
ASSERT_EQ(size_t(1), samples.size());
- ASSERT_TRUE(samples[0] != NULL);
+ ASSERT_TRUE(samples[0].get() != nullptr);
EXPECT_TRUE(crash->IsEqual(*samples[0]));
}
@@ -151,11 +151,11 @@ TEST_F(SerializationUtilsTest, WriteReadTest) {
SerializationUtils::WriteMetricToFile(*lhist.get(), filename);
SerializationUtils::WriteMetricToFile(*shist.get(), filename);
SerializationUtils::WriteMetricToFile(*action.get(), filename);
- ScopedVector<MetricSample> vect;
+ std::vector<std::unique_ptr<MetricSample>> vect;
SerializationUtils::ReadAndTruncateMetricsFromFile(filename, &vect);
ASSERT_EQ(vect.size(), size_t(5));
- for (MetricSample* sample : vect) {
- ASSERT_NE(nullptr, sample);
+ for (auto& sample : vect) {
+ ASSERT_NE(nullptr, sample.get());
}
EXPECT_TRUE(hist->IsEqual(*vect[0]));
EXPECT_TRUE(crash->IsEqual(*vect[1]));
« no previous file with comments | « components/metrics/serialization/serialization_utils.cc ('k') | ios/chrome/today_extension/today_metrics_logger.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698