Remove locked histogram macros since jar@chromium.org made the base macros threadsafe in http://crrev.com/80412.

BUG=none
TEST=metrics should work as before
Review URL: http://codereview.chromium.org/6800008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80668 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 9 deletions

diff --git a/chrome_frame/crash_reporting/crash_metrics.cc b/chrome_frame/crash_reporting/crash_metrics.cc
index 8909162..8a103f1 100644
--- a/chrome_frame/crash_reporting/crash_metrics.cc
+++ b/chrome_frame/crash_reporting/crash_metrics.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -72,29 +72,26 @@ int CrashMetricsReporter::IncrementMetric(Metric metric) {
 void CrashMetricsReporter::RecordCrashMetrics() {
   int navigation_count = GetMetric(NAVIGATION_COUNT);
   if (navigation_count > 0) {
-    THREAD_SAFE_UMA_HISTOGRAM_COUNTS("ChromeFrame.HostNavigationCount",
-                                     navigation_count);
+    UMA_HISTOGRAM_COUNTS("ChromeFrame.HostNavigationCount", navigation_count);
     SetMetric(NAVIGATION_COUNT, 0);
   }
 
   int chrome_frame_navigation_count = GetMetric(CHROME_FRAME_NAVIGATION_COUNT);
   if (chrome_frame_navigation_count > 0) {
-    THREAD_SAFE_UMA_HISTOGRAM_COUNTS("ChromeFrame.CFNavigationCount",
-                                     chrome_frame_navigation_count);
+    UMA_HISTOGRAM_COUNTS("ChromeFrame.CFNavigationCount",
+                         chrome_frame_navigation_count);
     SetMetric(CHROME_FRAME_NAVIGATION_COUNT, 0);
   }
 
   int crash_count = GetMetric(CRASH_COUNT);
   if (crash_count > 0) {
-    THREAD_SAFE_UMA_HISTOGRAM_COUNTS("ChromeFrame.HostCrashCount",
-                                      crash_count);
+    UMA_HISTOGRAM_COUNTS("ChromeFrame.HostCrashCount", crash_count);
     SetMetric(CRASH_COUNT, 0);
   }
 
   int channel_error_count = GetMetric(CHANNEL_ERROR_COUNT);
   if (channel_error_count > 0) {
-    THREAD_SAFE_UMA_HISTOGRAM_COUNTS("ChromeFrame.ChannelErrorCount",
-                                      channel_error_count);
+    UMA_HISTOGRAM_COUNTS("ChromeFrame.ChannelErrorCount", channel_error_count);
     SetMetric(CHANNEL_ERROR_COUNT, 0);
   }
 }