Remove the wrapper functions content::RecordAction et al

chrome/browser/ui/webui/options/core_options_handler.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/ui/webui/options/core_options_handler.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_reader.h"
+#include "base/metrics/user_metrics.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
 #include "components/proxy_config/proxy_config_pref_names.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/url_formatter/url_fixer.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_types.h"
-#include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_ui.h"
 #include "extensions/browser/extension_pref_value_map.h"
 #include "extensions/browser/extension_pref_value_map_factory.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 using base::UserMetricsAction;
@@ skipping 268 matching lines @@
 
   ProcessUserMetric(value, metric);
 }
 
 void CoreOptionsHandler::ClearPref(const std::string& pref_name,
                                    const std::string& metric) {
   PrefService* pref_service = FindServiceForPref(pref_name);
   pref_service->ClearPref(pref_name);
 
   if (!metric.empty())
-    content::RecordComputedAction(metric);
+    base::RecordComputedAction(metric);
 }
 
 void CoreOptionsHandler::ProcessUserMetric(const base::Value* value,
                                            const std::string& metric) {
   if (metric.empty())
     return;
 
   std::string metric_string = metric;
   if (value->IsType(base::Value::Type::BOOLEAN)) {
     bool bool_value;
     CHECK(value->GetAsBoolean(&bool_value));
     metric_string += bool_value ? "_Enable" : "_Disable";
   }
 
-  content::RecordComputedAction(metric_string);
+  base::RecordComputedAction(metric_string);
 }
 
 void CoreOptionsHandler::NotifyPrefChanged(
     const std::string& pref_name,
     const std::string& controlling_pref_name) {
   std::unique_ptr<base::Value> value(
       CreateValueForPref(pref_name, controlling_pref_name));
   DispatchPrefChangeNotification(pref_name, std::move(value));
 }
 
@@ skipping 269 matching lines @@
     if (!args->GetString(1, &metric))
       NOTREACHED();
   }
 
   ClearPref(pref_name, metric);
 }
 
 void CoreOptionsHandler::HandleUserMetricsAction(const base::ListValue* args) {
   std::string metric = base::UTF16ToUTF8(ExtractStringValue(args));
   if (!metric.empty())
-    content::RecordComputedAction(metric);
+    base::RecordComputedAction(metric);
 }
 
 void CoreOptionsHandler::HandleDisableExtension(const base::ListValue* args) {
   std::string extension_id;
   if (args->GetString(0, &extension_id)) {
     ExtensionService* extension_service = extensions::ExtensionSystem::Get(
         Profile::FromWebUI(web_ui()))->extension_service();
     DCHECK(extension_service);
     extension_service->DisableExtension(
         extension_id, extensions::Extension::DISABLE_USER_ACTION);
@@ skipping 13 matching lines @@
       plugin_status_pref_setter_.IsPepperFlashSettingsEnabled());
   web_ui()->CallJavascriptFunctionUnsafe(
       "options.OptionsPage.setPepperFlashSettingsEnabled", enabled);
 }
 
 bool CoreOptionsHandler::IsUserUnsupervised(const base::Value* to_value) {
   return !Profile::FromWebUI(web_ui())->IsSupervised();
 }
 
 }  // namespace options