Upload UMA data using protocol buffers.

chrome/browser/metrics/metrics_log_serializer_unittest.cc

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 59c257b8c16e89f0884a631f65e15ca85a305027..176287e59d2c612f12a5e0026497d0fea600447c 100644
--- a/chrome/browser/metrics/metrics_log_serializer_unittest.cc
+++ b/chrome/browser/metrics/metrics_log_serializer_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -9,11 +9,13 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
-  class MetricsLogSerializerTest : public ::testing::Test {
-  };
-}
 
-static const size_t kMaxLocalListSize = 3;
+const size_t kMaxLocalListSize = 3;
+
+}  // namespace
+
+class MetricsLogSerializerTest : public ::testing::Test {

[jar (doing other things), 2012/02/23 01:59:18]

The class definition should still be inside the anonymous namespace, so that it
is not visible outside this object file.

(As mentioned in another comment) I think that static is helpful in adding
clarity (without having to scan farther in the file).

[Ilya Sherman, 2012/02/24 02:10:06]

Somebody... and unfortunately, I don't remember who, at this point... once told
me that the classes that are used as test fixtures should be defined outside of
anonymous namespaces, due to something about how the bots are configured.  I'm
happy to be convinced that that's false, though -- I'm all for hiding symbols in
anonymous namespaces, generally :)

+};
 
 // Store and retrieve empty list.
 TEST(MetricsLogSerializerTest, EmptyLogList) {
@@ -25,8 +27,9 @@ TEST(MetricsLogSerializerTest, EmptyLogList) {
   EXPECT_EQ(0U, list.GetSize());
 
   local_list.clear();  // ReadLogsFromPrefList() expects empty |local_list|.
-  EXPECT_EQ(MetricsLogSerializer::LIST_EMPTY,
-            MetricsLogSerializer::ReadLogsFromPrefList(list, &local_list));
+  EXPECT_EQ(
+      MetricsLogSerializer::LIST_EMPTY,
+      MetricsLogSerializer::ReadLogsFromPrefList(list, true, &local_list));
   EXPECT_EQ(0U, local_list.size());
 }
 
@@ -43,7 +46,7 @@ TEST(MetricsLogSerializerTest, SingleElementLogList) {
 
   // |list| will now contain the following:
   // [1, Base64Encode("Hello world!"), MD5("Hello world!")].
-  EXPECT_EQ(3U, list.GetSize());
+  ASSERT_EQ(3U, list.GetSize());
 
   // Examine each element.
   ListValue::const_iterator it = list.begin();
@@ -66,8 +69,9 @@ TEST(MetricsLogSerializerTest, SingleElementLogList) {
   EXPECT_TRUE(it == list.end());  // Reached end of list.
 
   local_list.clear();
-  EXPECT_EQ(MetricsLogSerializer::RECALL_SUCCESS,
-            MetricsLogSerializer::ReadLogsFromPrefList(list, &local_list));
+  EXPECT_EQ(
+      MetricsLogSerializer::RECALL_SUCCESS,
+      MetricsLogSerializer::ReadLogsFromPrefList(list, true, &local_list));
   EXPECT_EQ(1U, local_list.size());
 }
 
@@ -95,15 +99,16 @@ TEST(MetricsLogSerializerTest, OverLimitLogList) {
 
   std::string actual_first;
   EXPECT_TRUE((*(list.begin() + 1))->GetAsString(&actual_first));
-  EXPECT_TRUE(expected_first == actual_first);
+  EXPECT_EQ(expected_first, actual_first);
 
   std::string actual_last;
   EXPECT_TRUE((*(list.end() - 2))->GetAsString(&actual_last));
-  EXPECT_TRUE(expected_last == actual_last);
+  EXPECT_EQ(expected_last, actual_last);
 
   local_list.clear();
-  EXPECT_EQ(MetricsLogSerializer::RECALL_SUCCESS,
-            MetricsLogSerializer::ReadLogsFromPrefList(list, &local_list));
+  EXPECT_EQ(
+      MetricsLogSerializer::RECALL_SUCCESS,
+      MetricsLogSerializer::ReadLogsFromPrefList(list, true, &local_list));
   EXPECT_EQ(kMaxLocalListSize, local_list.size());
 }
 
@@ -123,8 +128,9 @@ TEST(MetricsLogSerializerTest, SmallRecoveredListSize) {
   EXPECT_EQ(2U, list.GetSize());
 
   local_list.clear();
-  EXPECT_EQ(MetricsLogSerializer::LIST_SIZE_TOO_SMALL,
-            MetricsLogSerializer::ReadLogsFromPrefList(list, &local_list));
+  EXPECT_EQ(
+      MetricsLogSerializer::LIST_SIZE_TOO_SMALL,
+      MetricsLogSerializer::ReadLogsFromPrefList(list, true, &local_list));
 }
 
 // Remove size from the stored list.
@@ -143,8 +149,9 @@ TEST(MetricsLogSerializerTest, RemoveSizeFromLogList) {
   EXPECT_EQ(3U, list.GetSize());
 
   local_list.clear();
-  EXPECT_EQ(MetricsLogSerializer::LIST_SIZE_MISSING,
-            MetricsLogSerializer::ReadLogsFromPrefList(list, &local_list));
+  EXPECT_EQ(
+      MetricsLogSerializer::LIST_SIZE_MISSING,
+      MetricsLogSerializer::ReadLogsFromPrefList(list, true, &local_list));
 }
 
 // Corrupt size of stored list.
@@ -163,8 +170,9 @@ TEST(MetricsLogSerializerTest, CorruptSizeOfLogList) {
   EXPECT_EQ(3U, list.GetSize());
 
   local_list.clear();
-  EXPECT_EQ(MetricsLogSerializer::LIST_SIZE_CORRUPTION,
-            MetricsLogSerializer::ReadLogsFromPrefList(list, &local_list));
+  EXPECT_EQ(
+      MetricsLogSerializer::LIST_SIZE_CORRUPTION,
+      MetricsLogSerializer::ReadLogsFromPrefList(list, true, &local_list));
 }
 
 // Corrupt checksum of stored list.
@@ -187,6 +195,7 @@ TEST(MetricsLogSerializerTest, CorruptChecksumOfLogList) {
   EXPECT_EQ(3U, list.GetSize());
 
   local_list.clear();
-  EXPECT_EQ(MetricsLogSerializer::CHECKSUM_CORRUPTION,
-            MetricsLogSerializer::ReadLogsFromPrefList(list, &local_list));
+  EXPECT_EQ(
+      MetricsLogSerializer::CHECKSUM_CORRUPTION,
+      MetricsLogSerializer::ReadLogsFromPrefList(list, true, &local_list));
 }