Remove the wrapper functions content::RecordAction et al

chrome/browser/devtools/device/devtools_device_discovery.cc

 // Copyright 2014 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/devtools/device/devtools_device_discovery.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/memory/ptr_util.h"
+#include "base/metrics/user_metrics.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/devtools/devtools_protocol.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/devtools_external_agent_proxy.h"
 #include "content/public/browser/devtools_external_agent_proxy_delegate.h"
-#include "content/public/browser/user_metrics.h"
 #include "net/base/escape.h"
 
 using content::BrowserThread;
 using content::DevToolsAgentHost;
 using RemoteBrowser = DevToolsDeviceDiscovery::RemoteBrowser;
 using RemoteDevice = DevToolsDeviceDiscovery::RemoteDevice;
 using RemotePage = DevToolsDeviceDiscovery::RemotePage;
 
 namespace {
 
@@ skipping 221 matching lines @@
       socket_opened_(false),
       agent_host_(nullptr),
       proxy_(nullptr) {
 }
 
 AgentHostDelegate::~AgentHostDelegate() {
 }
 
 void AgentHostDelegate::Attach(content::DevToolsExternalAgentProxy* proxy) {
   proxy_ = proxy;
-  content::RecordAction(
+  base::RecordAction(
       base::StartsWith(browser_id_, kWebViewSocketPrefix,
                        base::CompareCase::SENSITIVE)
           ? base::UserMetricsAction("DevTools_InspectAndroidWebView")
           : base::UserMetricsAction("DevTools_InspectAndroidPage"));
   web_socket_.reset(
       device_->CreateWebSocket(browser_id_, target_path_, this));
 }
 
 void AgentHostDelegate::Detach() {
   web_socket_.reset();
@@ skipping 343 matching lines @@
 }
 
 void DevToolsDeviceDiscovery::ReceivedDeviceList(
     const CompleteDevices& complete_devices) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   task_scheduler_.Run(base::Bind(&DevToolsDeviceDiscovery::RequestDeviceList,
                                  weak_factory_.GetWeakPtr()));
   // |callback_| should be run last as it may destroy |this|.
   callback_.Run(complete_devices);
 }