Serialize/Deserialize support in HistogramBase

content/browser/histogram_synchronizer.cc

Index: content/browser/histogram_synchronizer.cc
diff --git a/content/browser/histogram_synchronizer.cc b/content/browser/histogram_synchronizer.cc
index 2fd3fea2bd66acd433e64496d78230f140a9ca20..32fdde37dc892f8d66fa862d6a0961fa87b8d365 100644
--- a/content/browser/histogram_synchronizer.cc
+++ b/content/browser/histogram_synchronizer.cc
@@ -8,6 +8,7 @@
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
+#include "base/pickle.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/browser/histogram_controller.h"
@@ -272,7 +273,10 @@ void HistogramSynchronizer::OnHistogramDataCollected(
   for (std::vector<std::string>::const_iterator it = pickled_histograms.begin();
        it < pickled_histograms.end();
        ++it) {
-    base::Histogram::DeserializeHistogramInfo(*it);
+    Pickle pickle(it->data(), it->size());
+    PickleIterator iter(pickle);
+

[Ilya Sherman, 2013/01/09 05:48:37]

nit: No need for this newline

[kaiwang, 2013/01/10 23:02:24]

Done.

+    base::DeserializeHistogramAndAddSamples(&iter);
   }
 
   if (!request)