Serialize/Deserialize support in HistogramBase

base/metrics/sparse_histogram_unittest.cc

Index: base/metrics/sparse_histogram_unittest.cc
diff --git a/base/metrics/sparse_histogram_unittest.cc b/base/metrics/sparse_histogram_unittest.cc
index b4eb8fddba71379cc004fc214fd39bb702f2c958..1b52b6cafb4a82c8df7ee4032e68ad6b14800a4e 100644
--- a/base/metrics/sparse_histogram_unittest.cc
+++ b/base/metrics/sparse_histogram_unittest.cc
@@ -5,8 +5,10 @@
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
+#include "base/metrics/histogram_base.h"
 #include "base/metrics/sample_map.h"
 #include "base/metrics/sparse_histogram.h"
+#include "base/pickle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
@@ -19,7 +21,7 @@ class SparseHistogramTest : public testing::Test {
 };
 
 TEST_F(SparseHistogramTest, BasicTest) {
-  scoped_ptr<SparseHistogram> histogram(NewSparseHistogram("Sparse1"));
+  scoped_ptr<SparseHistogram> histogram(NewSparseHistogram("Sparse"));
   scoped_ptr<HistogramSamples> snapshot(histogram->SnapshotSamples());
   EXPECT_EQ(0, snapshot->TotalCount());
   EXPECT_EQ(0, snapshot->sum());
@@ -37,4 +39,29 @@ TEST_F(SparseHistogramTest, BasicTest) {
   EXPECT_EQ(1, snapshot2->GetCount(101));
 }
 
+TEST_F(SparseHistogramTest, Serialize) {
+  scoped_ptr<SparseHistogram> histogram(NewSparseHistogram("Sparse"));
+  histogram->SetFlags(HistogramBase::kIPCSerializationSourceFlag);
+
+  Pickle pickle;
+  histogram->SerializeInfo(&pickle);
+
+  PickleIterator iter(pickle);
+
+  int type;
+  EXPECT_TRUE(iter.ReadInt(&type));
+  EXPECT_EQ(SPARSE_HISTOGRAM, type);
+
+  std::string name;
+  EXPECT_TRUE(iter.ReadString(&name));
+  EXPECT_EQ("Sparse", name);
+
+  int flag;
+  EXPECT_TRUE(iter.ReadInt(&flag));
+  EXPECT_EQ(HistogramBase::kIPCSerializationSourceFlag, flag);
+
+  // No more data in the pickle.
+  EXPECT_FALSE(iter.SkipBytes(1));
+}

[Ilya Sherman, 2012/12/29 00:17:30]

It seems like a more fruitful test would be to test that you can serialize a
histogram and deserialize it back to its original form.  There's currently no
test coverage for the deserialization code...

[kaiwang, 2013/01/08 00:51:40]

All deserializing tests are in histogram_base_unittests.cc (because the
deserialize function is there).
I added a TODO. Because currently SparseHistogram is not supported by
StatisticsRecorder, it's hard to test.

+
 }  // namespace base