Consolidate serialization code in base::HistogramDeltasSerializer.

base/metrics/histogram_base_unittest.cc

Index: base/metrics/histogram_base_unittest.cc
diff --git a/base/metrics/histogram_base_unittest.cc b/base/metrics/histogram_base_unittest.cc
index 0e19d56f4c1ad5e8f748c9c70eeab66e5eba7376..4a2963aa6c4034ce5adec6cfbf2f2e19883aee23 100644
--- a/base/metrics/histogram_base_unittest.cc
+++ b/base/metrics/histogram_base_unittest.cc
@@ -61,40 +61,6 @@ TEST_F(HistogramBaseTest, DeserializeHistogram) {
   EXPECT_EQ(HistogramBase::kUmaTargetedHistogramFlag, deserialized->flags());
 }
 
-TEST_F(HistogramBaseTest, DeserializeHistogramAndAddSamples) {
-  HistogramBase* histogram = Histogram::FactoryGet(
-      "TestHistogram", 1, 1000, 10, HistogramBase::kIPCSerializationSourceFlag);
-  histogram->Add(1);
-  histogram->Add(10);
-  histogram->Add(100);
-  histogram->Add(1000);
-
-  Pickle pickle;
-  ASSERT_TRUE(histogram->SerializeInfo(&pickle));
-  histogram->SnapshotSamples()->Serialize(&pickle);
-
-  PickleIterator iter(pickle);
-  DeserializeHistogramAndAddSamples(&iter);
-
-  // The histogram has kIPCSerializationSourceFlag. So samples will be ignored.
-  scoped_ptr<HistogramSamples> snapshot(histogram->SnapshotSamples());
-  EXPECT_EQ(1, snapshot->GetCount(1));
-  EXPECT_EQ(1, snapshot->GetCount(10));
-  EXPECT_EQ(1, snapshot->GetCount(100));
-  EXPECT_EQ(1, snapshot->GetCount(1000));
-
-  // Clear kIPCSerializationSourceFlag to emulate multi-process usage.
-  histogram->ClearFlags(HistogramBase::kIPCSerializationSourceFlag);
-  PickleIterator iter2(pickle);
-  DeserializeHistogramAndAddSamples(&iter2);
-
-  scoped_ptr<HistogramSamples> snapshot2(histogram->SnapshotSamples());
-  EXPECT_EQ(2, snapshot2->GetCount(1));
-  EXPECT_EQ(2, snapshot2->GetCount(10));
-  EXPECT_EQ(2, snapshot2->GetCount(100));
-  EXPECT_EQ(2, snapshot2->GetCount(1000));
-}
-
 TEST_F(HistogramBaseTest, DeserializeLinearHistogram) {
   HistogramBase* histogram = LinearHistogram::FactoryGet(
       "TestHistogram", 1, 1000, 10,