Revert of Embed a single sample in histogram metadata.

base/metrics/sample_map.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.
 
 #include "base/metrics/sample_map.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 
@@ skipping 66 matching lines @@
 }  // namespace
 
 SampleMap::SampleMap() : SampleMap(0) {}
 
 SampleMap::SampleMap(uint64_t id) : HistogramSamples(id) {}
 
 SampleMap::~SampleMap() {}
 
 void SampleMap::Accumulate(Sample value, Count count) {
   sample_counts_[value] += count;
-  IncreaseSumAndCount(static_cast<int64_t>(count) * value, count);
+  IncreaseSum(static_cast<int64_t>(count) * value);
+  IncreaseRedundantCount(count);
 }
 
 Count SampleMap::GetCount(Sample value) const {
   std::map<Sample, Count>::const_iterator it = sample_counts_.find(value);
   if (it == sample_counts_.end())
     return 0;
   return it->second;
 }
 
 Count SampleMap::TotalCount() const {
@@ skipping 16 matching lines @@
     iter->Get(&min, &max, &count);
     if (min + 1 != max)
       return false;  // SparseHistogram only supports bucket with size 1.
 
     sample_counts_[min] += (op == HistogramSamples::ADD) ? count : -count;
   }
   return true;
 }
 
 }  // namespace base