3 files changed, 6 insertions, 7 deletions
diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc
index efca9b6..6e4758d 100644
--- a/chrome/browser/extensions/extension_function_dispatcher.cc
+++ b/chrome/browser/extensions/extension_function_dispatcher.cc
@@ -45,7 +45,6 @@
 #include "chrome/browser/extensions/extension_webstore_private_api.h"
 #include "chrome/browser/extensions/extensions_quota_service.h"
 #include "chrome/browser/external_protocol_handler.h"
-#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
@@ -56,6 +55,7 @@
 #include "content/browser/child_process_security_policy.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
+#include "content/browser/user_metrics.h"
 #include "content/common/notification_service.h"
 #include "content/common/result_codes.h"
 #include "ipc/ipc_message.h"
diff --git a/chrome/browser/extensions/extension_metrics_module.cc b/chrome/browser/extensions/extension_metrics_module.cc
index 9681d84..8e3428d 100644
--- a/chrome/browser/extensions/extension_metrics_module.cc
+++ b/chrome/browser/extensions/extension_metrics_module.cc
@@ -7,9 +7,9 @@
 #include "base/metrics/histogram.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/ui/options/options_util.h"
 #include "chrome/installer/util/google_update_settings.h"
+#include "content/browser/user_metrics.h"
 
 using base::Histogram;
 using base::LinearHistogram;
@@ -57,7 +57,7 @@ bool MetricsRecordUserActionFunction::RunImpl() {
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &name));
 
   name = BuildMetricName(name, GetExtension());
-  UserMetrics::RecordComputedAction(name, profile());
+  UserMetrics::RecordComputedAction(name);
   return true;
 }
 
diff --git a/chrome/browser/extensions/file_manager_util.cc b/chrome/browser/extensions/file_manager_util.cc
index e838f16..bf831a5 100644
--- a/chrome/browser/extensions/file_manager_util.cc
+++ b/chrome/browser/extensions/file_manager_util.cc
@@ -7,10 +7,10 @@
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "content/browser/user_metrics.h"
 #include "third_party/libjingle/source/talk/base/urlencode.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
@@ -70,7 +70,7 @@ GURL FileManagerUtil::GetFileBrowserUrlWithParams(
 
 }
 // static
-void FileManagerUtil::ShowFullTabUrl(Profile* profile,
+void FileManagerUtil::ShowFullTabUrl(Profile*,
                                      const FilePath& default_path) {
   std::string json = GetArgumentsJson(SelectFileDialog::SELECT_NONE, string16(),
       default_path, NULL, 0, FilePath::StringType());
@@ -80,8 +80,7 @@ void FileManagerUtil::ShowFullTabUrl(Profile* profile,
   if (!browser)
     return;
 
-  UserMetrics::RecordAction(UserMetricsAction("ShowFileBrowserFullTab"),
-                            profile);
+  UserMetrics::RecordAction(UserMetricsAction("ShowFileBrowserFullTab"));
   browser->ShowSingletonTab(GURL(url));
 }