Remove the wrapper functions content::RecordAction et al

chrome/browser/ui/bookmarks/bookmark_context_menu_controller.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/bookmarks/bookmark_context_menu_controller.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
+#include "base/metrics/user_metrics.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/bookmarks/bookmark_editor.h"
 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
 #include "chrome/browser/ui/bookmarks/bookmark_utils_desktop.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/undo/bookmark_undo_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/bookmarks/browser/bookmark_client.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/common/bookmark_pref_names.h"
 #include "components/bookmarks/managed/managed_bookmark_service.h"
 #include "components/prefs/pref_service.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/undo/bookmark_undo_service.h"
 #include "content/public/browser/page_navigator.h"
-#include "content/public/browser/user_metrics.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::UserMetricsAction;
 using bookmarks::BookmarkNode;
 using content::PageNavigator;
 
 BookmarkContextMenuController::BookmarkContextMenuController(
     gfx::NativeWindow parent_window,
     BookmarkContextMenuControllerDelegate* delegate,
     Browser* browser,
@@ skipping 94 matching lines @@
 
   base::WeakPtr<BookmarkContextMenuController> ref(weak_factory_.GetWeakPtr());
 
   switch (id) {
     case IDC_BOOKMARK_BAR_OPEN_ALL:
     case IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO:
     case IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW: {
       WindowOpenDisposition initial_disposition;
       if (id == IDC_BOOKMARK_BAR_OPEN_ALL) {
         initial_disposition = WindowOpenDisposition::NEW_BACKGROUND_TAB;
-        content::RecordAction(
+        base::RecordAction(
             UserMetricsAction("BookmarkBar_ContextMenu_OpenAll"));
       } else if (id == IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW) {
         initial_disposition = WindowOpenDisposition::NEW_WINDOW;
-        content::RecordAction(
+        base::RecordAction(
             UserMetricsAction("BookmarkBar_ContextMenu_OpenAllInNewWindow"));
       } else {
         initial_disposition = WindowOpenDisposition::OFF_THE_RECORD;
-        content::RecordAction(
+        base::RecordAction(
             UserMetricsAction("BookmarkBar_ContextMenu_OpenAllIncognito"));
       }
       chrome::OpenAll(parent_window_, navigator_, selection_,
                       initial_disposition, profile_);
       break;
     }
 
     case IDC_BOOKMARK_BAR_RENAME_FOLDER:
     case IDC_BOOKMARK_BAR_EDIT:
-      content::RecordAction(
-          UserMetricsAction("BookmarkBar_ContextMenu_Edit"));
+      base::RecordAction(UserMetricsAction("BookmarkBar_ContextMenu_Edit"));
 
       if (selection_.size() != 1) {
         NOTREACHED();
         break;
       }
 
       BookmarkEditor::Show(
           parent_window_,
           profile_,
           BookmarkEditor::EditDetails::EditNode(selection_[0]),
           selection_[0]->is_url() ? BookmarkEditor::SHOW_TREE :
                                     BookmarkEditor::NO_TREE);
       break;
 
     case IDC_BOOKMARK_BAR_UNDO: {
-      content::RecordAction(
-          UserMetricsAction("BookmarkBar_ContextMenu_Undo"));
+      base::RecordAction(UserMetricsAction("BookmarkBar_ContextMenu_Undo"));
       BookmarkUndoServiceFactory::GetForProfile(profile_)->undo_manager()->
           Undo();
       break;
     }
 
     case IDC_BOOKMARK_BAR_REDO: {
-      content::RecordAction(
-          UserMetricsAction("BookmarkBar_ContextMenu_Redo"));
+      base::RecordAction(UserMetricsAction("BookmarkBar_ContextMenu_Redo"));
       BookmarkUndoServiceFactory::GetForProfile(profile_)->undo_manager()->
           Redo();
       break;
     }
 
     case IDC_BOOKMARK_BAR_REMOVE: {
-      content::RecordAction(
-          UserMetricsAction("BookmarkBar_ContextMenu_Remove"));
+      base::RecordAction(UserMetricsAction("BookmarkBar_ContextMenu_Remove"));
 
       for (size_t i = 0; i < selection_.size(); ++i) {
         int index = selection_[i]->parent()->GetIndexOf(selection_[i]);
         if (index > -1)
           model_->Remove(selection_[i]);
       }
       selection_.clear();
       break;
     }
 
     case IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK: {
-      content::RecordAction(
-          UserMetricsAction("BookmarkBar_ContextMenu_Add"));
+      base::RecordAction(UserMetricsAction("BookmarkBar_ContextMenu_Add"));
 
       int index;
       const BookmarkNode* parent =
           bookmarks::GetParentForNewNodes(parent_, selection_, &index);
       GURL url;
       base::string16 title;
       chrome::GetURLAndTitleToBookmark(
           browser_->tab_strip_model()->GetActiveWebContents(),
           &url, &title);
       BookmarkEditor::Show(parent_window_,
                            profile_,
                            BookmarkEditor::EditDetails::AddNodeInFolder(
                                parent, index, url, title),
                            BookmarkEditor::SHOW_TREE);
       break;
     }
 
     case IDC_BOOKMARK_BAR_NEW_FOLDER: {
-      content::RecordAction(
+      base::RecordAction(
           UserMetricsAction("BookmarkBar_ContextMenu_NewFolder"));
 
       int index;
       const BookmarkNode* parent =
           bookmarks::GetParentForNewNodes(parent_, selection_, &index);
       BookmarkEditor::Show(
           parent_window_,
           profile_,
           BookmarkEditor::EditDetails::AddFolder(parent, index),
           BookmarkEditor::SHOW_TREE);
@@ skipping 15 matching lines @@
     case IDC_BOOKMARK_BAR_SHOW_MANAGED_BOOKMARKS: {
       PrefService* prefs = profile_->GetPrefs();
       prefs->SetBoolean(
           bookmarks::prefs::kShowManagedBookmarksInBookmarkBar,
           !prefs->GetBoolean(
               bookmarks::prefs::kShowManagedBookmarksInBookmarkBar));
       break;
     }
 
     case IDC_BOOKMARK_MANAGER: {
-      content::RecordAction(UserMetricsAction("ShowBookmarkManager"));
+      base::RecordAction(UserMetricsAction("ShowBookmarkManager"));
       if (selection_.size() != 1)
         chrome::ShowBookmarkManager(browser_);
       else if (selection_[0]->is_folder())
         chrome::ShowBookmarkManagerForNode(browser_, selection_[0]->id());
       else if (parent_)
         chrome::ShowBookmarkManagerForNode(browser_, parent_->id());
       else
         chrome::ShowBookmarkManager(browser_);
       break;
     }
@@ skipping 149 matching lines @@
     return !managed->managed_node()->empty();
   }
 
   return true;
 }
 
 void BookmarkContextMenuController::BookmarkModelChanged() {
   if (delegate_)
     delegate_->CloseMenu();
 }