Avoid using Pickle::WriteSize(), which writes an architecture-dependent amount

base/metrics/histogram.cc

 // 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.
 
 // Histogram is an object that aggregates statistics, and can summarize them in
 // various forms, including ASCII graphical, HTML, and numerically (as a
 // vector of numbers corresponding to each of the aggregating buckets).
 // See header file for details and examples.
 
 #include "base/metrics/histogram.h"
@@ skipping 219 matching lines @@
 
 // static
 std::string Histogram::SerializeHistogramInfo(const Histogram& histogram,
                                               const SampleSet& snapshot) {
   DCHECK_NE(NOT_VALID_IN_RENDERER, histogram.histogram_type());
 
   Pickle pickle;
   pickle.WriteString(histogram.histogram_name());
   pickle.WriteInt(histogram.declared_min());
   pickle.WriteInt(histogram.declared_max());
-  pickle.WriteSize(histogram.bucket_count());
+  pickle.WriteUInt64(histogram.bucket_count());
   pickle.WriteUInt32(histogram.range_checksum());
   pickle.WriteInt(histogram.histogram_type());
   pickle.WriteInt(histogram.flags());
 
   snapshot.Serialize(&pickle);
 
   histogram.SerializeRanges(&pickle);
 
   return std::string(static_cast<const char*>(pickle.data()), pickle.size());
 }
 
 // static
 bool Histogram::DeserializeHistogramInfo(const std::string& histogram_info) {
   if (histogram_info.empty()) {
     return false;
   }
 
   Pickle pickle(histogram_info.data(),
                 static_cast<int>(histogram_info.size()));
   std::string histogram_name;
   int declared_min;
   int declared_max;
-  size_t bucket_count;
+  uint64 bucket_count;
   uint32 range_checksum;
   int histogram_type;
   int pickle_flags;
   SampleSet sample;
 
   PickleIterator iter(pickle);
   if (!iter.ReadString(&histogram_name) ||
       !iter.ReadInt(&declared_min) ||
       !iter.ReadInt(&declared_max) ||
-      !iter.ReadSize(&bucket_count) ||
+      !iter.ReadUInt64(&bucket_count) ||
       !iter.ReadUInt32(&range_checksum) ||
       !iter.ReadInt(&histogram_type) ||
       !iter.ReadInt(&pickle_flags) ||
       !sample.Histogram::SampleSet::Deserialize(&iter)) {
     DLOG(ERROR) << "Pickle error decoding Histogram: " << histogram_name;
     return false;
   }
 
   DCHECK(pickle_flags & kIPCSerializationSourceFlag);
   // Since these fields may have come from an untrusted renderer, do additional
@@ skipping 472 matching lines @@
   redundant_count_ -= other.redundant_count_;
   for (size_t index = 0; index < counts_.size(); ++index) {
     counts_[index] -= other.counts_[index];
     DCHECK_GE(counts_[index], 0);
   }
 }
 
 bool Histogram::SampleSet::Serialize(Pickle* pickle) const {
   pickle->WriteInt64(sum_);
   pickle->WriteInt64(redundant_count_);
-  pickle->WriteSize(counts_.size());
+  pickle->WriteUInt64(counts_.size());
 
   for (size_t index = 0; index < counts_.size(); ++index) {
     pickle->WriteInt(counts_[index]);
   }
 
   return true;
 }
 
 bool Histogram::SampleSet::Deserialize(PickleIterator* iter) {
   DCHECK_EQ(counts_.size(), 0u);
   DCHECK_EQ(sum_, 0);
   DCHECK_EQ(redundant_count_, 0);
 
-  size_t counts_size;
+  uint64 counts_size;
 
   if (!iter->ReadInt64(&sum_) ||
       !iter->ReadInt64(&redundant_count_) ||
-      !iter->ReadSize(&counts_size)) {
+      !iter->ReadUInt64(&counts_size)) {
     return false;
   }
 
   if (counts_size == 0)
     return false;
 
   int count = 0;
-  for (size_t index = 0; index < counts_size; ++index) {
+  for (uint64 index = 0; index < counts_size; ++index) {
     int i;
     if (!iter->ReadInt(&i))
       return false;
     counts_.push_back(i);
     count += i;
   }
   DCHECK_EQ(count, redundant_count_);
   return count == redundant_count_;
 }
 
@@ skipping 521 matching lines @@
 
 // static
 StatisticsRecorder::HistogramMap* StatisticsRecorder::histograms_ = NULL;
 // static
 StatisticsRecorder::RangesMap* StatisticsRecorder::ranges_ = NULL;
 // static
 base::Lock* StatisticsRecorder::lock_ = NULL;
 // static
 bool StatisticsRecorder::dump_on_exit_ = false;
 }  // namespace base