Introduce BookmarkClient interface to abstract embedder

chrome/test/base/testing_profile.cc

 // Copyright (c) 2012 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/test/base/testing_profile.h"
 
 #include "build/build_config.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 476 matching lines @@
     // TopSitesImpl::Shutdown schedules some tasks (from TopSitesBackend) that
     // need to be run to properly shutdown. Run all pending tasks now. This is
     // normally handled by browser_process shutdown.
     if (base::MessageLoop::current())
       base::MessageLoop::current()->RunUntilIdle();
   }
 }
 
 static KeyedService* BuildBookmarkModel(content::BrowserContext* context) {
   Profile* profile = static_cast<Profile*>(context);
-  BookmarkModel* bookmark_model = new BookmarkModel(profile);
-  bookmark_model->Load(profile->GetIOTaskRunner());
-  return bookmark_model;
+  ChromeBookmarkClient* bookmark_client = new ChromeBookmarkClient(profile);
+  bookmark_client->model()->Load(
+      profile->GetPrefs(),
+      profile->GetPath(),
+      profile->GetIOTaskRunner(),
+      content::BrowserThread::GetMessageLoopProxyForThread(
+          content::BrowserThread::UI));
+  return bookmark_client;
 }
 
 void TestingProfile::CreateBookmarkModel(bool delete_file) {
   if (delete_file) {
     base::FilePath path = GetPath().Append(bookmarks::kBookmarksFileName);
     base::DeleteFile(path, false);
   }
   // This will create a bookmark model.
-  BookmarkModel* bookmark_service = static_cast<BookmarkModel*>(
+  ChromeBookmarkClient* bookmark_client = static_cast<ChromeBookmarkClient*>(
       BookmarkModelFactory::GetInstance()->SetTestingFactoryAndUse(
           this, BuildBookmarkModel));
 
   HistoryService* history_service =
       HistoryServiceFactory::GetForProfileWithoutCreating(this);
   if (history_service) {
+    BookmarkService* bookmark_service = bookmark_client->model();
     history_service->history_backend_->bookmark_service_ = bookmark_service;
     history_service->history_backend_->expirer_.bookmark_service_ =
         bookmark_service;
   }
 }
 
 static KeyedService* BuildWebDataService(content::BrowserContext* profile) {
   return new WebDataServiceWrapper(static_cast<Profile*>(profile));
 }
 
@@ skipping 434 matching lines @@
       path_,
       delegate_,
       extension_policy_,
       pref_service_.Pass(),
       incognito_,
       guest_session_,
       managed_user_id_,
       policy_service_.Pass(),
       testing_factories_));
 }