summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/chrome_frame_histograms.cc2
-rw-r--r--chrome_frame/chrome_frame_histograms.h3
2 files changed, 5 insertions, 0 deletions
diff --git a/chrome_frame/chrome_frame_histograms.cc b/chrome_frame/chrome_frame_histograms.cc
index 904cbec..f7592e4 100644
--- a/chrome_frame/chrome_frame_histograms.cc
+++ b/chrome_frame/chrome_frame_histograms.cc
@@ -22,6 +22,8 @@ ChromeFrameHistogramSnapshots::ChromeFrameHistogramSnapshots() {
ChromeFrameHistogramSnapshots::HistogramPickledList
ChromeFrameHistogramSnapshots::GatherAllHistograms() {
+ AutoLock auto_lock(lock_);
+
StatisticsRecorder::Histograms histograms;
StatisticsRecorder::GetHistograms(&histograms);
diff --git a/chrome_frame/chrome_frame_histograms.h b/chrome_frame/chrome_frame_histograms.h
index 03aaab5..0e7e600 100644
--- a/chrome_frame/chrome_frame_histograms.h
+++ b/chrome_frame/chrome_frame_histograms.h
@@ -48,6 +48,9 @@ class ChromeFrameHistogramSnapshots {
// histogram) so that we can send only the delta with the next log.
LoggedSampleMap logged_samples_;
+ // Synchronizes the histogram gathering operation.
+ Lock lock_;
+
DISALLOW_COPY_AND_ASSIGN(ChromeFrameHistogramSnapshots);
};