Introduce BookmarkClient interface to abstract embedder

chrome/browser/ui/bookmarks/bookmark_browsertest.cc

Index: chrome/browser/ui/bookmarks/bookmark_browsertest.cc
diff --git a/chrome/browser/ui/bookmarks/bookmark_browsertest.cc b/chrome/browser/ui/bookmarks/bookmark_browsertest.cc
index 66a07d0c76ce89d8ca97fbea04f4e9b5c303a20d..fa9d8b00f82af3561d5627025a8eac81fea77e47 100644
--- a/chrome/browser/ui/bookmarks/bookmark_browsertest.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_browsertest.cc
@@ -80,9 +80,10 @@ IN_PROC_BROWSER_TEST_F(BookmarkBrowsertest, BookmarkBarVisibleWait) {
 IN_PROC_BROWSER_TEST_F(BookmarkBrowsertest, PRE_Persist) {
   BookmarkModel* bookmark_model = WaitForBookmarkModel(browser()->profile());
 
-  bookmark_utils::AddIfNotBookmarked(
-      bookmark_model, GURL(kPersistBookmarkURL),
-      base::ASCIIToUTF16(kPersistBookmarkTitle));
+  bookmark_utils::AddIfNotBookmarked(bookmark_model,
+                                     bookmark_model,
+                                     GURL(kPersistBookmarkURL),
+                                     base::ASCIIToUTF16(kPersistBookmarkTitle));
 }
 
 #if defined(THREAD_SANITIZER)
@@ -120,9 +121,10 @@ IN_PROC_BROWSER_TEST_F(BookmarkBrowsertest, DISABLED_MultiProfile) {
   Browser* browser2 = observer.WaitForSingleNewBrowser();
   BookmarkModel* bookmark_model2 = WaitForBookmarkModel(browser2->profile());
 
-  bookmark_utils::AddIfNotBookmarked(
-      bookmark_model1, GURL(kPersistBookmarkURL),
-      base::ASCIIToUTF16(kPersistBookmarkTitle));
+  bookmark_utils::AddIfNotBookmarked(bookmark_model1,
+                                     bookmark_model1,
+                                     GURL(kPersistBookmarkURL),
+                                     base::ASCIIToUTF16(kPersistBookmarkTitle));
   std::vector<BookmarkService::URLAndTitle> urls1, urls2;
   bookmark_model1->GetBookmarks(&urls1);
   bookmark_model2->GetBookmarks(&urls2);