Remove the wrapper functions content::RecordAction et al

chrome/browser/ui/ash/chrome_screenshot_grabber.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/ui/ash/chrome_screenshot_grabber.h"
 
 #include <stddef.h>
 
 #include "ash/common/system/system_notifier.h"
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_util.h"
 #include "base/i18n/time_formatting.h"
 #include "base/macros.h"
+#include "base/metrics/user_metrics.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/file_manager/open_util.h"
 #include "chrome/browser/chromeos/note_taking_helper.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/notifications/notifier_state_tracker.h"
 #include "chrome/browser/notifications/notifier_state_tracker_factory.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/theme_resources.h"
 #include "chromeos/login/login_state.h"
 #include "components/drive/chromeos/file_system_interface.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/user_metrics.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/strings/grit/ui_strings.h"
 
 namespace {
 
 const char kNotificationId[] = "screenshot";
 
@@ skipping 11 matching lines @@
   // Only care about HTML because Chrome OS doesn't need other formats.
   // TODO(dcheng): Why don't we take advantage of the ability to write bitmaps
   // to the clipboard here?
   {
     ui::ScopedClipboardWriter scw(ui::CLIPBOARD_TYPE_COPY_PASTE);
     std::string html(kImageClipboardFormatPrefix);
     html += encoded;
     html += kImageClipboardFormatSuffix;
     scw.WriteHTML(base::UTF8ToUTF16(html), std::string());
   }
-  content::RecordAction(base::UserMetricsAction("Screenshot_CopyClipboard"));
+  base::RecordAction(base::UserMetricsAction("Screenshot_CopyClipboard"));
 }
 
 void ReadFileAndCopyToClipboardLocal(const base::FilePath& screenshot_path) {
   DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
 
   scoped_refptr<base::RefCountedString> png_data(new base::RefCountedString());
   if (!base::ReadFileToString(screenshot_path, &(png_data->data()))) {
     LOG(ERROR) << "Failed to read the screenshot file: "
                << screenshot_path.value();
     return;
@@ skipping 51 matching lines @@
         }
         content::BrowserThread::GetBlockingPool()->PostTask(
             FROM_HERE,
             base::Bind(&ReadFileAndCopyToClipboardLocal, screenshot_path_));
         break;
       }
       case BUTTON_ANNOTATE: {
         chromeos::NoteTakingHelper* helper = chromeos::NoteTakingHelper::Get();
         if (helper->IsAppAvailable(profile_)) {
           helper->LaunchAppForNewNote(profile_, screenshot_path_);
-          content::RecordAction(base::UserMetricsAction("Screenshot_Annotate"));
+          base::RecordAction(base::UserMetricsAction("Screenshot_Annotate"));
         }
         break;
       }
       default:
         NOTREACHED() << "Unhandled button index " << button_index;
     }
   }
   bool HasClickedListener() override { return success_; }
   std::string id() const override { return std::string(kNotificationId); }
 
@@ skipping 166 matching lines @@
   for (size_t i = 0; i < root_windows.size(); ++i) {
     aura::Window* root_window = root_windows[i];
     std::string basename = screenshot_basename;
     gfx::Rect rect = root_window->bounds();
     if (root_windows.size() > 1)
       basename += base::StringPrintf(" - Display %d", static_cast<int>(i + 1));
     base::FilePath screenshot_path =
         screenshot_directory.AppendASCII(basename + ".png");
     screenshot_grabber_->TakeScreenshot(root_window, rect, screenshot_path);
   }
-  content::RecordAction(base::UserMetricsAction("Screenshot_TakeFull"));
+  base::RecordAction(base::UserMetricsAction("Screenshot_TakeFull"));
 }
 
 void ChromeScreenshotGrabber::HandleTakePartialScreenshot(
     aura::Window* window,
     const gfx::Rect& rect) {
   if (ScreenshotsDisabled()) {
     screenshot_grabber_->NotifyScreenshotCompleted(
         ui::ScreenshotGrabberObserver::SCREENSHOTS_DISABLED, base::FilePath());
     return;
   }
 
   base::FilePath screenshot_directory;
   if (!GetScreenshotDirectory(&screenshot_directory)) {
     screenshot_grabber_->NotifyScreenshotCompleted(
         ui::ScreenshotGrabberObserver::SCREENSHOT_GET_DIR_FAILED,
         base::FilePath());
     return;
   }
 
   base::FilePath screenshot_path =
       screenshot_directory.AppendASCII(GetScreenshotBaseFilename() + ".png");
   screenshot_grabber_->TakeScreenshot(window, rect, screenshot_path);
-  content::RecordAction(base::UserMetricsAction("Screenshot_TakePartial"));
+  base::RecordAction(base::UserMetricsAction("Screenshot_TakePartial"));
 }
 
 void ChromeScreenshotGrabber::HandleTakeWindowScreenshot(aura::Window* window) {
   if (ScreenshotsDisabled()) {
     screenshot_grabber_->NotifyScreenshotCompleted(
         ui::ScreenshotGrabberObserver::SCREENSHOTS_DISABLED, base::FilePath());
     return;
   }
 
   base::FilePath screenshot_directory;
   if (!GetScreenshotDirectory(&screenshot_directory)) {
     screenshot_grabber_->NotifyScreenshotCompleted(
         ui::ScreenshotGrabberObserver::SCREENSHOT_GET_DIR_FAILED,
         base::FilePath());
     return;
   }
 
   base::FilePath screenshot_path =
       screenshot_directory.AppendASCII(GetScreenshotBaseFilename() + ".png");
   screenshot_grabber_->TakeScreenshot(window,
                                       gfx::Rect(window->bounds().size()),
                                       screenshot_path);
-  content::RecordAction(base::UserMetricsAction("Screenshot_TakeWindow"));
+  base::RecordAction(base::UserMetricsAction("Screenshot_TakeWindow"));
 }
 
 bool ChromeScreenshotGrabber::CanTakeScreenshot() {
   return screenshot_grabber_->CanTakeScreenshot();
 }
 
 void ChromeScreenshotGrabber::PrepareFileAndRunOnBlockingPool(
     const base::FilePath& path,
     scoped_refptr<base::TaskRunner> blocking_task_runner,
     const FileCallback& callback) {
@@ skipping 79 matching lines @@
 }
 
 void ChromeScreenshotGrabber::SetProfileForTest(Profile* profile) {
   profile_for_test_ = profile;
 }
 
 Profile* ChromeScreenshotGrabber::GetProfile() {
   return profile_for_test_ ? profile_for_test_
                            : ProfileManager::GetActiveUserProfile();
 }