Remove the wrapper functions content::RecordAction et al

chrome/browser/android/metrics/uma_session_stats.cc

 // Copyright 2015 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/android/metrics/uma_session_stats.h"
 
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram_macros.h"
+#include "base/metrics/user_metrics.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "components/metrics/metrics_pref_names.h"
 #include "components/metrics/metrics_service.h"
 #include "components/metrics_services_manager/metrics_services_manager.h"
 #include "components/prefs/pref_service.h"
 #include "components/ukm/ukm_service.h"
 #include "components/variations/metrics_util.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/user_metrics.h"
 #include "jni/UmaSessionStats_jni.h"
 
 using base::android::ConvertJavaStringToUTF8;
 using base::android::JavaParamRef;
 using base::UserMetricsAction;
 
 namespace {
 UmaSessionStats* g_uma_session_stats = NULL;
 }  // namespace
 
@@ skipping 178 matching lines @@
                                   const JavaParamRef<jclass>&,
                                   jint num_tabs) {
   // Record how many tabs total are open.
   UMA_HISTOGRAM_CUSTOM_COUNTS("Tabs.TabCountPerLoad", num_tabs, 1, 200, 50);
 }
 
 static void RecordPageLoaded(JNIEnv*,
                              const JavaParamRef<jclass>&,
                              jboolean is_desktop_user_agent) {
   // Should be called whenever a page has been loaded.
-  content::RecordAction(UserMetricsAction("MobilePageLoaded"));
+  base::RecordAction(UserMetricsAction("MobilePageLoaded"));
   if (is_desktop_user_agent) {
-    content::RecordAction(
-        UserMetricsAction("MobilePageLoadedDesktopUserAgent"));
+    base::RecordAction(UserMetricsAction("MobilePageLoadedDesktopUserAgent"));
   }
 }
 
 static void RecordPageLoadedWithKeyboard(JNIEnv*, const JavaParamRef<jclass>&) {
-  content::RecordAction(UserMetricsAction("MobilePageLoadedWithKeyboard"));
+  base::RecordAction(UserMetricsAction("MobilePageLoadedWithKeyboard"));
 }
 
 static jlong Init(JNIEnv* env, const JavaParamRef<jclass>& obj) {
   // We should have only one UmaSessionStats instance.
   DCHECK(!g_uma_session_stats);
   g_uma_session_stats = new UmaSessionStats();
   return reinterpret_cast<intptr_t>(g_uma_session_stats);
 }
 
 // Register native methods
 bool RegisterUmaSessionStats(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }