Remove the wrapper functions content::RecordAction et al

chrome/browser/pepper_broker_infobar_delegate.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/pepper_broker_infobar_delegate.h"
 
+#include "base/metrics/user_metrics.h"
 #include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/plugins/plugin_finder.h"
 #include "chrome/browser/plugins/plugin_metadata.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/infobars/core/infobar.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/url_formatter/elide_url.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/plugin_service.h"
-#include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/referrer.h"
 #include "content/public/common/webplugininfo.h"
 #include "ui/base/l10n/l10n_util.h"
 
 // static
 void PepperBrokerInfoBarDelegate::Create(
     content::WebContents* web_contents,
     const GURL& url,
     const base::FilePath& plugin_path,
@@ skipping 10 matching lines @@
       TabSpecificContentSettings::FromWebContents(web_contents);
 
   HostContentSettingsMap* content_settings =
       HostContentSettingsMapFactory::GetForProfile(profile);
   ContentSetting setting =
       content_settings->GetContentSetting(url, url,
                                           CONTENT_SETTINGS_TYPE_PPAPI_BROKER,
                                           std::string());
 
   if (setting == CONTENT_SETTING_ASK) {
-    content::RecordAction(
-        base::UserMetricsAction("PPAPI.BrokerInfobarDisplayed"));
+    base::RecordAction(base::UserMetricsAction("PPAPI.BrokerInfobarDisplayed"));
     InfoBarService* infobar_service =
         InfoBarService::FromWebContents(web_contents);
     infobar_service->AddInfoBar(infobar_service->CreateConfirmInfoBar(
         std::unique_ptr<ConfirmInfoBarDelegate>(
             new PepperBrokerInfoBarDelegate(url, plugin_path, content_settings,
                                             tab_content_settings, callback))));
     return;
   }
 
   bool allowed = (setting == CONTENT_SETTING_ALLOW);
-  content::RecordAction(allowed ?
-      base::UserMetricsAction("PPAPI.BrokerSettingAllow") :
-      base::UserMetricsAction("PPAPI.BrokerSettingDeny"));
+  base::RecordAction(allowed
+                         ? base::UserMetricsAction("PPAPI.BrokerSettingAllow")
+                         : base::UserMetricsAction("PPAPI.BrokerSettingDeny"));
   tab_content_settings->SetPepperBrokerAllowed(allowed);
   callback.Run(allowed);
 }
 
 PepperBrokerInfoBarDelegate::PepperBrokerInfoBarDelegate(
     const GURL& url,
     const base::FilePath& plugin_path,
     HostContentSettingsMap* content_settings,
     TabSpecificContentSettings* tab_content_settings,
     const base::Callback<void(bool)>& callback)
@@ skipping 50 matching lines @@
 
 base::string16 PepperBrokerInfoBarDelegate::GetLinkText() const {
   return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
 }
 
 GURL PepperBrokerInfoBarDelegate::GetLinkURL() const {
   return GURL("https://support.google.com/chrome/?p=ib_pepper_broker");
 }
 
 void PepperBrokerInfoBarDelegate::DispatchCallback(bool result) {
-  content::RecordAction(result ?
-      base::UserMetricsAction("PPAPI.BrokerInfobarClickedAllow") :
-      base::UserMetricsAction("PPAPI.BrokerInfobarClickedDeny"));
+  base::RecordAction(
+      result ? base::UserMetricsAction("PPAPI.BrokerInfobarClickedAllow")
+             : base::UserMetricsAction("PPAPI.BrokerInfobarClickedDeny"));
   callback_.Run(result);
   callback_ = base::Callback<void(bool)>();
   content_settings_->SetContentSettingDefaultScope(
       url_, GURL(), CONTENT_SETTINGS_TYPE_PPAPI_BROKER, std::string(),
       result ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);
   tab_content_settings_->SetPepperBrokerAllowed(result);
 }