Split UserMetrics into API vs. implementation. Move API to content/public.

chrome/browser/chromeos/external_metrics.cc

 // 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.
 
 #include "chrome/browser/chromeos/external_metrics.h"
 
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include <string>
 
+#include "base/basictypes.h"
 #include "base/bind.h"
-#include "base/basictypes.h"
 #include "base/eintr_wrapper.h"
 #include "base/metrics/histogram.h"
 #include "base/perftimer.h"
 #include "base/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/metrics_service.h"
-#include "content/browser/user_metrics.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/user_metrics.h"
 
 using content::BrowserThread;
+using content::UserMetricsAction;
 
 namespace chromeos {
 
 // The interval between external metrics collections, in milliseconds.
 static const int kExternalMetricsCollectionIntervalMs = 30 * 1000;
 
 ExternalMetrics::ExternalMetrics()
     : test_recorder_(NULL) {
 }
 
@@ skipping 13 matching lines @@
   valid_user_actions_.insert("Accel_BrightnessUp_F7");
   valid_user_actions_.insert("Cryptohome.PKCS11InitFail");
   valid_user_actions_.insert("Updater.ServerCertificateChanged");
   valid_user_actions_.insert("Updater.ServerCertificateFailed");
 
   ScheduleCollector();
 }
 
 void ExternalMetrics::RecordActionUI(std::string action_string) {
   if (valid_user_actions_.count(action_string)) {
-    UserMetrics::RecordComputedAction(action_string);
+    content::RecordComputedAction(action_string);
   } else {
     LOG(ERROR) << "undefined UMA action: " << action_string;
   }
 }
 
 void ExternalMetrics::RecordAction(const char* action) {
   std::string action_string(action);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&ExternalMetrics::RecordActionUI, this, action_string));
@@ skipping 163 matching lines @@
 void ExternalMetrics::ScheduleCollector() {
   bool result;
   result = BrowserThread::PostDelayedTask(
     BrowserThread::FILE, FROM_HERE,
     base::Bind(&chromeos::ExternalMetrics::CollectEventsAndReschedule, this),
     kExternalMetricsCollectionIntervalMs);
   DCHECK(result);
 }
 
 }  // namespace chromeos