Remove the wrapper functions content::RecordAction et al

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 <stddef.h>
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/metrics/statistics_recorder.h"
+#include "base/metrics/user_metrics.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/chromeos_metrics_provider.h"
 #include "components/metrics/metrics_service.h"
 #include "components/metrics/serialization/metric_sample.h"
 #include "components/metrics/serialization/serialization_utils.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/user_metrics.h"
 
-using base::UserMetricsAction;
 using content::BrowserThread;
 
 namespace chromeos {
 
 namespace {
 
 bool CheckValues(const std::string& name,
                  int minimum,
                  int maximum,
                  uint32_t bucket_count) {
@@ skipping 28 matching lines @@
 
 // static
 scoped_refptr<ExternalMetrics> ExternalMetrics::CreateForTesting(
     const std::string& filename) {
   scoped_refptr<ExternalMetrics> external_metrics(new ExternalMetrics());
   external_metrics->uma_events_file_ = filename;
   return external_metrics;
 }
 
 void ExternalMetrics::RecordActionUI(const std::string& action_string) {
-  content::RecordComputedAction(action_string);
+  base::RecordComputedAction(action_string);
 }
 
 void ExternalMetrics::RecordAction(const std::string& action) {
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&ExternalMetrics::RecordActionUI, this, action));
 }
 
 void ExternalMetrics::RecordCrashUI(const std::string& crash_kind) {
@@ skipping 86 matching lines @@
 
 void ExternalMetrics::ScheduleCollector() {
   bool result = BrowserThread::GetBlockingPool()->PostDelayedWorkerTask(
       FROM_HERE,
       base::Bind(&chromeos::ExternalMetrics::CollectEventsAndReschedule, this),
       base::TimeDelta::FromSeconds(kExternalMetricsCollectionIntervalSeconds));
   DCHECK(result);
 }
 
 }  // namespace chromeos