Introduce BookmarkClient interface to abstract embedder

chrome/browser/bookmarks/bookmark_stats.cc

Index: chrome/browser/bookmarks/bookmark_stats.cc
diff --git a/chrome/browser/bookmarks/bookmark_stats.cc b/chrome/browser/bookmarks/bookmark_stats.cc
index a95dcdc6ea05bf276952d9fa5c9c357d33b73864..51c4767ff397804f490af6e3f73a5d401c3e893f 100644
--- a/chrome/browser/bookmarks/bookmark_stats.cc
+++ b/chrome/browser/bookmarks/bookmark_stats.cc
@@ -5,14 +5,16 @@
 #include "chrome/browser/bookmarks/bookmark_stats.h"
 
 #include "base/metrics/histogram.h"
-#include "chrome/browser/bookmarks/bookmark_model.h"
-#include "content/public/browser/user_metrics.h"
+#include "base/metrics/user_metrics.h"
+#include "components/bookmarks/core/browser/bookmark_client.h"
+#include "components/bookmarks/core/browser/bookmark_node.h"
 
-void RecordBookmarkLaunch(const BookmarkNode* node,
+void RecordBookmarkLaunch(BookmarkClient* client,
+                          const BookmarkNode* node,
                           BookmarkLaunchLocation location) {
   if (location == BOOKMARK_LAUNCH_LOCATION_DETACHED_BAR ||
       location == BOOKMARK_LAUNCH_LOCATION_ATTACHED_BAR) {
-    content::RecordAction(
+    client->RecordAction(
         base::UserMetricsAction("ClickedBookmarkBarURLButton"));
   }
   UMA_HISTOGRAM_ENUMERATION(
@@ -32,18 +34,19 @@ void RecordBookmarkLaunch(const BookmarkNode* node,
   UMA_HISTOGRAM_COUNTS("Bookmarks.LaunchDepth", depth - 2);
 }
 
-void RecordBookmarkFolderOpen(BookmarkLaunchLocation location) {
+void RecordBookmarkFolderOpen(BookmarkClient* client,
+                              BookmarkLaunchLocation location) {
   if (location == BOOKMARK_LAUNCH_LOCATION_DETACHED_BAR ||
       location == BOOKMARK_LAUNCH_LOCATION_ATTACHED_BAR) {
-    content::RecordAction(
-        base::UserMetricsAction("ClickedBookmarkBarFolder"));
+    client->RecordAction(base::UserMetricsAction("ClickedBookmarkBarFolder"));
   }
 }
 
-void RecordBookmarkAppsPageOpen(BookmarkLaunchLocation location) {
+void RecordBookmarkAppsPageOpen(BookmarkClient* client,
+                                BookmarkLaunchLocation location) {
   if (location == BOOKMARK_LAUNCH_LOCATION_DETACHED_BAR ||
       location == BOOKMARK_LAUNCH_LOCATION_ATTACHED_BAR) {
-    content::RecordAction(
+    client->RecordAction(
         base::UserMetricsAction("ClickedBookmarkBarAppsShortcutButton"));
   }
 }