| Index: chrome/browser/metrics/metrics_log_serializer_unittest.cc
|
| diff --git a/chrome/browser/metrics/metrics_log_serializer_unittest.cc b/chrome/browser/metrics/metrics_log_serializer_unittest.cc
|
| index ce5c5b2d416e1db17463006adfc0eae7898b8731..583394020bddd1b602b2f34119e8fcc28c857c61 100644
|
| --- a/chrome/browser/metrics/metrics_log_serializer_unittest.cc
|
| +++ b/chrome/browser/metrics/metrics_log_serializer_unittest.cc
|
| @@ -23,7 +23,7 @@ void SetLogText(const std::string& log_text,
|
|
|
| // Store and retrieve empty list.
|
| TEST(MetricsLogSerializerTest, EmptyLogList) {
|
| - ListValue list;
|
| + base::ListValue list;
|
| std::vector<MetricsLogManager::SerializedLog> local_list;
|
|
|
| MetricsLogSerializer::WriteLogsToPrefList(local_list, kListLengthLimit,
|
| @@ -39,7 +39,7 @@ TEST(MetricsLogSerializerTest, EmptyLogList) {
|
|
|
| // Store and retrieve a single log value.
|
| TEST(MetricsLogSerializerTest, SingleElementLogList) {
|
| - ListValue list;
|
| + base::ListValue list;
|
|
|
| std::vector<MetricsLogManager::SerializedLog> local_list(1);
|
| SetLogText("Hello world!", &local_list[0]);
|
| @@ -52,7 +52,7 @@ TEST(MetricsLogSerializerTest, SingleElementLogList) {
|
| ASSERT_EQ(3U, list.GetSize());
|
|
|
| // Examine each element.
|
| - ListValue::const_iterator it = list.begin();
|
| + base::ListValue::const_iterator it = list.begin();
|
| int size = 0;
|
| (*it)->GetAsInteger(&size);
|
| EXPECT_EQ(1, size);
|
| @@ -81,7 +81,7 @@ TEST(MetricsLogSerializerTest, SingleElementLogList) {
|
| // Store a set of logs over the length limit, but smaller than the min number of
|
| // bytes.
|
| TEST(MetricsLogSerializerTest, LongButTinyLogList) {
|
| - ListValue list;
|
| + base::ListValue list;
|
|
|
| size_t log_count = kListLengthLimit * 5;
|
| std::vector<MetricsLogManager::SerializedLog> local_list(log_count);
|
| @@ -102,7 +102,7 @@ TEST(MetricsLogSerializerTest, LongButTinyLogList) {
|
| // Store a set of logs over the length limit, but that doesn't reach the minimum
|
| // number of bytes until after passing the length limit.
|
| TEST(MetricsLogSerializerTest, LongButSmallLogList) {
|
| - ListValue list;
|
| + base::ListValue list;
|
|
|
| size_t log_count = kListLengthLimit * 5;
|
| // Make log_count logs each slightly larger than
|
| @@ -135,7 +135,7 @@ TEST(MetricsLogSerializerTest, LongButSmallLogList) {
|
| // Store a set of logs within the length limit, but well over the minimum
|
| // number of bytes.
|
| TEST(MetricsLogSerializerTest, ShortButLargeLogList) {
|
| - ListValue list;
|
| + base::ListValue list;
|
|
|
| std::vector<MetricsLogManager::SerializedLog> local_list(kListLengthLimit);
|
| // Make the total byte count about twice the minimum.
|
| @@ -158,7 +158,7 @@ TEST(MetricsLogSerializerTest, ShortButLargeLogList) {
|
| // Store a set of logs over the length limit, and over the minimum number of
|
| // bytes.
|
| TEST(MetricsLogSerializerTest, LongAndLargeLogList) {
|
| - ListValue list;
|
| + base::ListValue list;
|
|
|
| // Include twice the max number of logs.
|
| std::vector<MetricsLogManager::SerializedLog>
|
| @@ -186,7 +186,7 @@ TEST(MetricsLogSerializerTest, LongAndLargeLogList) {
|
|
|
| // Induce LIST_SIZE_TOO_SMALL corruption
|
| TEST(MetricsLogSerializerTest, SmallRecoveredListSize) {
|
| - ListValue list;
|
| + base::ListValue list;
|
|
|
| std::vector<MetricsLogManager::SerializedLog> local_list(1);
|
| SetLogText("Hello world!", &local_list[0]);
|
| @@ -207,7 +207,7 @@ TEST(MetricsLogSerializerTest, SmallRecoveredListSize) {
|
|
|
| // Remove size from the stored list.
|
| TEST(MetricsLogSerializerTest, RemoveSizeFromLogList) {
|
| - ListValue list;
|
| + base::ListValue list;
|
|
|
| std::vector<MetricsLogManager::SerializedLog> local_list(2);
|
| SetLogText("one", &local_list[0]);
|
| @@ -228,7 +228,7 @@ TEST(MetricsLogSerializerTest, RemoveSizeFromLogList) {
|
|
|
| // Corrupt size of stored list.
|
| TEST(MetricsLogSerializerTest, CorruptSizeOfLogList) {
|
| - ListValue list;
|
| + base::ListValue list;
|
|
|
| std::vector<MetricsLogManager::SerializedLog> local_list(1);
|
| SetLogText("Hello world!", &local_list[0]);
|
| @@ -238,7 +238,7 @@ TEST(MetricsLogSerializerTest, CorruptSizeOfLogList) {
|
| EXPECT_EQ(3U, list.GetSize());
|
|
|
| // Change list size from 1 to 2.
|
| - EXPECT_TRUE(list.Set(0, Value::CreateIntegerValue(2)));
|
| + EXPECT_TRUE(list.Set(0, base::Value::CreateIntegerValue(2)));
|
| EXPECT_EQ(3U, list.GetSize());
|
|
|
| local_list.clear();
|
| @@ -249,7 +249,7 @@ TEST(MetricsLogSerializerTest, CorruptSizeOfLogList) {
|
|
|
| // Corrupt checksum of stored list.
|
| TEST(MetricsLogSerializerTest, CorruptChecksumOfLogList) {
|
| - ListValue list;
|
| + base::ListValue list;
|
|
|
| std::vector<MetricsLogManager::SerializedLog> local_list(1);
|
| SetLogText("Hello world!", &local_list[0]);
|
| @@ -262,7 +262,7 @@ TEST(MetricsLogSerializerTest, CorruptChecksumOfLogList) {
|
| std::string checksum;
|
| EXPECT_TRUE((*(list.end() - 1))->GetAsString(&checksum));
|
| checksum[0] = (checksum[0] == 'a') ? 'b' : 'a';
|
| - EXPECT_TRUE(list.Set(2, Value::CreateStringValue(checksum)));
|
| + EXPECT_TRUE(list.Set(2, base::Value::CreateStringValue(checksum)));
|
| EXPECT_EQ(3U, list.GetSize());
|
|
|
| local_list.clear();
|
|
|