Introduce BookmarkClient interface to abstract embedder

chrome/test/base/testing_profile.cc

Index: chrome/test/base/testing_profile.cc
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index 48898087d285caea56f51f547cb7f03f60199ea7..040d7c0cef2fe287b9367f187a4c70d2b1995576 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -17,6 +17,7 @@
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
+#include "chrome/browser/bookmarks/chrome_bookmark_client.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
@@ -494,9 +495,16 @@ void TestingProfile::DestroyTopSites() {
 
 static KeyedService* BuildBookmarkModel(content::BrowserContext* context) {
   Profile* profile = static_cast<Profile*>(context);
-  BookmarkModel* bookmark_model = new BookmarkModel(profile, false);
-  bookmark_model->Load(profile->GetIOTaskRunner());
-  return bookmark_model;
+  ChromeBookmarkClient* bookmark_client =
+      new ChromeBookmarkClient(profile, false);
+  bookmark_client->model()->Load(
+      profile->GetPrefs(),
+      profile->GetPrefs()->GetString(prefs::kAcceptLanguages),
+      profile->GetPath(),
+      profile->GetIOTaskRunner(),
+      content::BrowserThread::GetMessageLoopProxyForThread(
+          content::BrowserThread::UI));
+  return bookmark_client;
 }
 
 void TestingProfile::CreateBookmarkModel(bool delete_file) {
@@ -505,9 +513,10 @@ void TestingProfile::CreateBookmarkModel(bool delete_file) {
     base::DeleteFile(path, false);
   }
   // This will create a bookmark model.
-  BookmarkModel* bookmark_service = static_cast<BookmarkModel*>(
-      BookmarkModelFactory::GetInstance()->SetTestingFactoryAndUse(
-          this, BuildBookmarkModel));
+  BookmarkModel* bookmark_service =
+      static_cast<ChromeBookmarkClient*>(
+          BookmarkModelFactory::GetInstance()->SetTestingFactoryAndUse(
+              this, BuildBookmarkModel))->model();
 
   HistoryService* history_service =
       HistoryServiceFactory::GetForProfileWithoutCreating(this);