Change some operations touching counts_[] to be atomic.

base/metrics/histogram_base.h

 // 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.
 
 #ifndef BASE_METRICS_HISTOGRAM_BASE_H_
 #define BASE_METRICS_HISTOGRAM_BASE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 31 matching lines @@
 // Create or find existing histogram that matches the pickled info.
 // Returns NULL if the pickled data has problems.
 BASE_EXPORT_PRIVATE HistogramBase* DeserializeHistogramInfo(
     PickleIterator* iter);
 
 ////////////////////////////////////////////////////////////////////////////////
 
 class BASE_EXPORT HistogramBase {
  public:
   typedef int Sample;                   // Used for samples.
-  typedef subtle::Atomic32 Count;     // Used to count samples.
+  typedef subtle::Atomic32 AtomicCount; // Used to count samples.
+  typedef int32 Count;  // Used to manipulate counts in temporaries.
 
   static const Sample kSampleType_MAX;  // INT_MAX
 
   enum Flags {
     kNoFlags = 0,
     kUmaTargetedHistogramFlag = 0x1,  // Histogram should be UMA uploaded.
 
     // Indicate that the histogram was pickled to be sent across an IPC Channel.
     // If we observe this flag on a histogram being aggregated into after IPC,
     // then we are running in a single process mode, and the aggregation should
@@ skipping 97 matching lines @@
  private:
   const std::string histogram_name_;
   int32 flags_;
 
   DISALLOW_COPY_AND_ASSIGN(HistogramBase);
 };
 
 }  // namespace base
 
 #endif  // BASE_METRICS_HISTOGRAM_BASE_H_