Remove the wrapper functions content::RecordAction et al

chrome/browser/ui/sync/one_click_signin_sync_starter.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/sync/one_click_signin_sync_starter.h"
 
 #include <stddef.h>
 
 #include "base/metrics/histogram_macros.h"
+#include "base/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/policy/cloud/user_policy_signin_service.h"
 #include "chrome/browser/policy/cloud/user_policy_signin_service_factory.h"
 #include "chrome/browser/profiles/profile_attributes_entry.h"
 #include "chrome/browser/profiles/profile_attributes_storage.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_window.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/prefs/pref_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/browser/signin_metrics.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "components/sync/base/sync_prefs.h"
-#include "content/public/browser/user_metrics.h"
 #include "net/base/url_util.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using browser_sync::ProfileSyncService;
 
 namespace {
 
 // UMA histogram for tracking what users do when presented with the signin
 // screen.
@@ skipping 127 matching lines @@
 OneClickSigninSyncStarter::SigninDialogDelegate::SigninDialogDelegate(
     base::WeakPtr<OneClickSigninSyncStarter> sync_starter)
     : sync_starter_(sync_starter) {
 }
 
 OneClickSigninSyncStarter::SigninDialogDelegate::~SigninDialogDelegate() {
 }
 
 void OneClickSigninSyncStarter::SigninDialogDelegate::OnCancelSignin() {
   SetUserChoiceHistogram(SIGNIN_CHOICE_CANCEL);
-  content::RecordAction(
+  base::RecordAction(
       base::UserMetricsAction("Signin_EnterpriseAccountPrompt_Cancel"));
   if (sync_starter_)
     sync_starter_->CancelSigninAndDelete();
 }
 
 void OneClickSigninSyncStarter::SigninDialogDelegate::OnContinueSignin() {
   SetUserChoiceHistogram(SIGNIN_CHOICE_CONTINUE);
-  content::RecordAction(
+  base::RecordAction(
       base::UserMetricsAction("Signin_EnterpriseAccountPrompt_ImportData"));
 
   if (sync_starter_)
     sync_starter_->LoadPolicyWithCachedCredentials();
 }
 
 void OneClickSigninSyncStarter::SigninDialogDelegate::OnSigninWithNewProfile() {
   SetUserChoiceHistogram(SIGNIN_CHOICE_NEW_PROFILE);
-  content::RecordAction(
+  base::RecordAction(
       base::UserMetricsAction("Signin_EnterpriseAccountPrompt_DontImportData"));
 
   if (sync_starter_)
     sync_starter_->CreateNewSignedInProfile();
 }
 
 void OneClickSigninSyncStarter::OnRegisteredForPolicy(
     const std::string& dm_token, const std::string& client_id) {
   SigninManager* signin = SigninManagerFactory::GetForProfile(profile_);
   // If there's no token for the user (policy registration did not succeed) just
@@ skipping 14 matching lines @@
 
   // Allow user to create a new profile before continuing with sign-in.
   browser_ = EnsureBrowser(browser_, profile_);
   content::WebContents* web_contents =
       browser_->tab_strip_model()->GetActiveWebContents();
   if (!web_contents) {
     CancelSigninAndDelete();
     return;
   }
 
-  content::RecordAction(
+  base::RecordAction(
       base::UserMetricsAction("Signin_Show_EnterpriseAccountPrompt"));
   TabDialogs::FromWebContents(web_contents)
       ->ShowProfileSigninConfirmation(browser_, profile_,
                                       signin->GetUsernameForAuthInProgress(),
                                       base::MakeUnique<SigninDialogDelegate>(
                                           weak_pointer_factory_.GetWeakPtr()));
 }
 
 void OneClickSigninSyncStarter::LoadPolicyWithCachedCredentials() {
   DCHECK(!dm_token_.empty());
@@ skipping 118 matching lines @@
                 signin_metrics::SignoutDelete::IGNORE_METRIC);
   // The statement above results in a call to SigninFailed() which will free
   // this object, so do not refer to the OneClickSigninSyncStarter object
   // after this point.
 }
 
 void OneClickSigninSyncStarter::ConfirmAndSignin() {
   SigninManager* signin = SigninManagerFactory::GetForProfile(profile_);
   if (confirmation_required_ == CONFIRM_UNTRUSTED_SIGNIN) {
     browser_ = EnsureBrowser(browser_, profile_);
-    content::RecordAction(
+    base::RecordAction(
         base::UserMetricsAction("Signin_Show_UntrustedSigninPrompt"));
     // Display a confirmation dialog to the user.
     browser_->window()->ShowOneClickSigninConfirmation(
         base::UTF8ToUTF16(signin->GetUsernameForAuthInProgress()),
         base::Bind(&OneClickSigninSyncStarter::UntrustedSigninConfirmed,
                    weak_pointer_factory_.GetWeakPtr()));
   } else {
     // No confirmation required - just sign in the user.
     signin->CompletePendingSignin();
   }
 }
 
 void OneClickSigninSyncStarter::UntrustedSigninConfirmed(
     StartSyncMode response) {
   if (response == UNDO_SYNC) {
-    content::RecordAction(base::UserMetricsAction("Signin_Undo_Signin"));
+    base::RecordAction(base::UserMetricsAction("Signin_Undo_Signin"));
     CancelSigninAndDelete();  // This statement frees this object.
   } else {
     // If the user clicked the "Advanced" link in the confirmation dialog, then
     // override the current start_mode_ to bring up the advanced sync settings.
 
     // If the user signs in from the new avatar bubble, the untrusted dialog
     // would dismiss the avatar bubble, thus it won't show any confirmation upon
     // sign in completes. This dialog already has a settings link, thus we just
     // start sync immediately .
 
@@ skipping 11 matching lines @@
     LoginUIService::SyncConfirmationUIClosedResult result) {
 
   if (switches::UsePasswordSeparatedSigninFlow()) {
     // We didn't run this callback in AccountAddedToCookie so do it now.
     if (!sync_setup_completed_callback_.is_null())
       sync_setup_completed_callback_.Run(SYNC_SETUP_SUCCESS);
   }
 
   switch (result) {
     case LoginUIService::CONFIGURE_SYNC_FIRST:
-      content::RecordAction(
+      base::RecordAction(
           base::UserMetricsAction("Signin_Signin_WithAdvancedSyncSettings"));
       chrome::ShowSettingsSubPage(browser_, chrome::kSyncSetupSubPage);
       break;
     case LoginUIService::SYNC_WITH_DEFAULT_SETTINGS: {
-      content::RecordAction(
+      base::RecordAction(
           base::UserMetricsAction("Signin_Signin_WithDefaultSyncSettings"));
       ProfileSyncService* profile_sync_service = GetProfileSyncService();
       if (profile_sync_service)
         profile_sync_service->SetFirstSetupComplete();
       FinishProfileSyncServiceSetup();
       break;
     }
     case LoginUIService::ABORT_SIGNIN:
       FinishProfileSyncServiceSetup();
       break;
@@ skipping 26 matching lines @@
   delete this;
 }
 
 void OneClickSigninSyncStarter::SigninSuccess() {
   if (!current_url_.is_valid())  // Could be invalid for tests.
     return;
   signin_metrics::LogSigninAccessPointCompleted(
       signin::GetAccessPointForPromoURL(current_url_));
   signin_metrics::LogSigninReason(
       signin::GetSigninReasonForPromoURL(current_url_));
-  content::RecordAction(base::UserMetricsAction("Signin_Signin_Succeed"));
+  base::RecordAction(base::UserMetricsAction("Signin_Signin_Succeed"));
 }
 
 void OneClickSigninSyncStarter::AccountAddedToCookie(
     const GoogleServiceAuthError& error) {
   if (first_account_added_to_cookie_)
     return;
 
   first_account_added_to_cookie_ = true;
 
   // Regardless of whether the account was successfully added or not,
@@ skipping 175 matching lines @@
                                             false /* user_gesture */);
 }
 
 void OneClickSigninSyncStarter::LoadContinueUrl() {
   web_contents()->GetController().LoadURL(
       continue_url_,
       content::Referrer(),
       ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
       std::string());
 }