Histogram argument related change

chrome/browser/chromeos/external_metrics.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 "chrome/browser/chromeos/external_metrics.h"
 
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ skipping 14 matching lines @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/user_metrics.h"
 
 using content::BrowserThread;
 using content::UserMetricsAction;
 
 namespace chromeos {
 
+namespace {
+
+bool CheckValues(const std::string& name,
+                 int minimum,
+                 int maximum,
+                 size_t bucket_count) {
+  if (!base::Histogram::InspectConstructionArguments(
+      name, &minimum, &maximum, &bucket_count))
+    return false;
+  base::HistogramBase* histogram =
+      base::StatisticsRecorder::FindHistogram(name);
+  if (!histogram)
+    return true;
+  return histogram->HasConstructionArguments(minimum, maximum, bucket_count);
+}
+
+bool CheckLinearValues(const std::string& name, int maximum) {
+  return CheckValues(name, 1, maximum, maximum + 1);
+}
+
+}  // namespace
+
 // The interval between external metrics collections in seconds
 static const int kExternalMetricsCollectionIntervalSeconds = 30;
 
-class SystemHistogram : public base::Histogram {
- public:
-  static bool CheckValues(const std::string& name,
-                          int minimum,
-                          int maximum,
-                          size_t bucket_count) {
-    if (!base::Histogram::InspectConstructionArguments(
-        name, &minimum, &maximum, &bucket_count))
-      return false;
-    Histogram* histogram = base::StatisticsRecorder::FindHistogram(name);
-    if (!histogram)
-      return true;
-    return histogram->HasConstructionArguments(minimum, maximum, bucket_count);
-  }
-  static bool CheckLinearValues(const std::string& name, int maximum) {
-    return CheckValues(name, 1, maximum, maximum + 1);
-  }
-};
-
 ExternalMetrics::ExternalMetrics()
     : test_recorder_(NULL) {
 }
 
 ExternalMetrics::~ExternalMetrics() {}
 
 void ExternalMetrics::Start() {
   // Register user actions external to the browser.
   // chrome/tools/extract_actions.py won't understand these lines, so all of
   // these are explicitly added in that script.
@@ skipping 36 matching lines @@
 void ExternalMetrics::RecordHistogram(const char* histogram_data) {
   int sample, min, max, nbuckets;
   char name[128];   // length must be consistent with sscanf format below.
   int n = sscanf(histogram_data, "%127s %d %d %d %d",
                  name, &sample, &min, &max, &nbuckets);
   if (n != 5) {
     LOG(ERROR) << "bad histogram request: " << histogram_data;
     return;
   }
 
-  if (!SystemHistogram::CheckValues(name, min, max, nbuckets)) {
+  if (!CheckValues(name, min, max, nbuckets)) {
     LOG(ERROR) << "Invalid histogram " << name
                << ", min=" << min
                << ", max=" << max
                << ", nbuckets=" << nbuckets;
     return;
   }
   // Do not use the UMA_HISTOGRAM_... macros here.  They cache the Histogram
   // instance and thus only work if |name| is constant.
   base::Histogram* counter = base::Histogram::FactoryGet(
       name, min, max, nbuckets, base::Histogram::kUmaTargetedHistogramFlag);
   counter->Add(sample);
 }
 
 void ExternalMetrics::RecordLinearHistogram(const char* histogram_data) {
   int sample, max;
   char name[128];   // length must be consistent with sscanf format below.
   int n = sscanf(histogram_data, "%127s %d %d", name, &sample, &max);
   if (n != 3) {
     LOG(ERROR) << "bad linear histogram request: " << histogram_data;
     return;
   }
 
-  if (!SystemHistogram::CheckLinearValues(name, max)) {
+  if (!CheckLinearValues(name, max)) {
     LOG(ERROR) << "Invalid linear histogram " << name
                << ", max=" << max;
     return;
   }
   // Do not use the UMA_HISTOGRAM_... macros here.  They cache the Histogram
   // instance and thus only work if |name| is constant.
   base::Histogram* counter = base::LinearHistogram::FactoryGet(
       name, 1, max, max + 1, base::Histogram::kUmaTargetedHistogramFlag);
   counter->Add(sample);
 }
@@ skipping 119 matching lines @@
 void ExternalMetrics::ScheduleCollector() {
   bool result;
   result = BrowserThread::PostDelayedTask(
     BrowserThread::FILE, FROM_HERE,
     base::Bind(&chromeos::ExternalMetrics::CollectEventsAndReschedule, this),
     base::TimeDelta::FromSeconds(kExternalMetricsCollectionIntervalSeconds));
   DCHECK(result);
 }
 
 }  // namespace chromeos