Remove the wrapper functions content::RecordAction et al

chrome/browser/ui/webui/options/chromeos/display_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/chromeos/display_options_handler.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "ash/display/display_configuration_controller.h"
 #include "ash/display/resolution_notification_controller.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
+#include "base/metrics/user_metrics.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/display/display_preferences.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/chromeos_switches.h"
-#include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_ui.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/display/display.h"
 #include "ui/display/display_layout.h"
 #include "ui/display/display_layout_builder.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/screen.h"
 #include "ui/display/types/display_constants.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size_conversions.h"
@@ skipping 360 matching lines @@
 void DisplayOptionsHandler::HandleDisplayInfo(
     const base::ListValue* unused_args) {
   SendAllDisplayInfo();
 }
 
 void DisplayOptionsHandler::HandleMirroring(const base::ListValue* args) {
   DCHECK(!args->empty());
   bool is_mirroring = false;
   if (!args->GetBoolean(0, &is_mirroring))
     NOTREACHED();
-  content::RecordAction(
-      base::UserMetricsAction("Options_DisplayToggleMirroring"));
+  base::RecordAction(base::UserMetricsAction("Options_DisplayToggleMirroring"));
   GetDisplayConfigurationController()->SetMirrorMode(is_mirroring);
 }
 
 void DisplayOptionsHandler::HandleSetPrimary(const base::ListValue* args) {
   DCHECK(!args->empty());
   int64_t display_id = GetDisplayIdFromArgs(args);
   if (display_id == display::kInvalidDisplayId)
     return;
 
-  content::RecordAction(base::UserMetricsAction("Options_DisplaySetPrimary"));
+  base::RecordAction(base::UserMetricsAction("Options_DisplaySetPrimary"));
   GetDisplayConfigurationController()->SetPrimaryDisplayId(display_id);
 }
 
 void DisplayOptionsHandler::HandleSetDisplayLayout(
     const base::ListValue* args) {
   const base::ListValue* layouts = nullptr;
   if (!args->GetList(0, &layouts))
     NOTREACHED();
-  content::RecordAction(base::UserMetricsAction("Options_DisplayRearrange"));
+  base::RecordAction(base::UserMetricsAction("Options_DisplayRearrange"));
 
   display::DisplayManager* display_manager = GetDisplayManager();
   display::DisplayLayoutBuilder builder(
       display_manager->GetCurrentDisplayLayout());
   builder.ClearPlacements();
   for (const auto& layout : *layouts) {
     const base::DictionaryValue* dictionary;
     if (!layout->GetAsDictionary(&dictionary)) {
       LOG(ERROR) << "Invalid layout dictionary: " << *dictionary;
       continue;
@@ skipping 40 matching lines @@
   if (!args->GetDictionary(1, &mode_data)) {
     LOG(ERROR) << "Failed to get mode data";
     return;
   }
 
   scoped_refptr<display::ManagedDisplayMode> mode =
       ConvertValueToManagedDisplayMode(mode_data);
   if (!mode)
     return;
 
-  content::RecordAction(
-      base::UserMetricsAction("Options_DisplaySetResolution"));
+  base::RecordAction(base::UserMetricsAction("Options_DisplaySetResolution"));
   display::DisplayManager* display_manager = GetDisplayManager();
   scoped_refptr<display::ManagedDisplayMode> current_mode =
       display_manager->GetActiveModeForDisplayId(display_id);
   if (!display_manager->SetDisplayMode(display_id, mode)) {
     LOG(ERROR) << "Unable to set display mode for: " << display_id
                << " Mode: " << *mode_data;
     return;
   }
   if (display::Display::IsInternalDisplayId(display_id))
     return;
@@ skipping 20 matching lines @@
   display::Display::Rotation new_rotation = display::Display::ROTATE_0;
   if (rotation_value == 90)
     new_rotation = display::Display::ROTATE_90;
   else if (rotation_value == 180)
     new_rotation = display::Display::ROTATE_180;
   else if (rotation_value == 270)
     new_rotation = display::Display::ROTATE_270;
   else if (rotation_value != 0)
     LOG(ERROR) << "Invalid rotation: " << rotation_value << " Falls back to 0";
 
-  content::RecordAction(
-      base::UserMetricsAction("Options_DisplaySetOrientation"));
+  base::RecordAction(base::UserMetricsAction("Options_DisplaySetOrientation"));
   GetDisplayConfigurationController()->SetDisplayRotation(
       display_id, new_rotation, display::Display::ROTATION_SOURCE_USER);
 }
 
 void DisplayOptionsHandler::HandleSetColorProfile(const base::ListValue* args) {
   DCHECK(!args->empty());
   int64_t display_id = GetDisplayIdFromArgs(args);
   if (display_id == display::kInvalidDisplayId)
     return;
 
   std::string profile_value;
   if (!args->GetString(1, &profile_value)) {
     LOG(ERROR) << "Invalid profile_value";
     return;
   }
 
   int profile_id;
   if (!base::StringToInt(profile_value, &profile_id)) {
     LOG(ERROR) << "Invalid profile: " << profile_value;
     return;
   }
 
   if (profile_id < display::COLOR_PROFILE_STANDARD ||
       profile_id > display::COLOR_PROFILE_READING) {
     LOG(ERROR) << "Invalid profile_id: " << profile_id;
     return;
   }
 
-  content::RecordAction(
-      base::UserMetricsAction("Options_DisplaySetColorProfile"));
+  base::RecordAction(base::UserMetricsAction("Options_DisplaySetColorProfile"));
   GetDisplayManager()->SetColorCalibrationProfile(
       display_id, static_cast<display::ColorCalibrationProfile>(profile_id));
 
   SendAllDisplayInfo();
 }
 
 void DisplayOptionsHandler::HandleSetUnifiedDesktopEnabled(
     const base::ListValue* args) {
   DCHECK(GetDisplayManager()->unified_desktop_enabled());
   bool enable = false;
   if (!args->GetBoolean(0, &enable))
     NOTREACHED();
 
   GetDisplayManager()->SetDefaultMultiDisplayModeForCurrentDisplays(
       enable ? display::DisplayManager::UNIFIED
              : display::DisplayManager::EXTENDED);
 }
 
 }  // namespace options
 }  // namespace chromeos