Introduce BookmarkClient interface to abstract embedder

chrome/browser/bookmarks/bookmark_model_factory.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/browser/bookmarks/bookmark_model_factory.h"
 
 #include "base/command_line.h"
 #include "base/deferred_sequenced_task_runner.h"
 #include "base/memory/singleton.h"
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/startup_task_runner_service.h"
 #include "chrome/browser/profiles/startup_task_runner_service_factory.h"
 #include "chrome/browser/undo/bookmark_undo_service.h"
 #include "chrome/browser/undo/bookmark_undo_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/bookmarks/core/common/bookmark_pref_names.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/user_prefs/pref_registry_syncable.h"
+#include "content/public/browser/browser_thread.h"
 
 // static
 BookmarkModel* BookmarkModelFactory::GetForProfile(Profile* profile) {
-  return static_cast<BookmarkModel*>(
+  ChromeBookmarkClient* bookmark_client = static_cast<ChromeBookmarkClient*>(
       GetInstance()->GetServiceForBrowserContext(profile, true));
+  return bookmark_client ? bookmark_client->model() : NULL;
 }
 
 BookmarkModel* BookmarkModelFactory::GetForProfileIfExists(Profile* profile) {
-  return static_cast<BookmarkModel*>(
+  ChromeBookmarkClient* bookmark_client = static_cast<ChromeBookmarkClient*>(
       GetInstance()->GetServiceForBrowserContext(profile, false));
+  return bookmark_client ? bookmark_client->model() : NULL;
 }
 
 // static
 BookmarkModelFactory* BookmarkModelFactory::GetInstance() {
   return Singleton<BookmarkModelFactory>::get();
 }
 
 BookmarkModelFactory::BookmarkModelFactory()
     : BrowserContextKeyedServiceFactory(
         "BookmarkModel",
         BrowserContextDependencyManager::GetInstance()) {
 }
 
 BookmarkModelFactory::~BookmarkModelFactory() {}
 
 KeyedService* BookmarkModelFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   Profile* profile = static_cast<Profile*>(context);
-  BookmarkModel* bookmark_model = new BookmarkModel(profile);
-  bookmark_model->Load(StartupTaskRunnerServiceFactory::GetForProfile(profile)->
-      GetBookmarkTaskRunner());
+  ChromeBookmarkClient* bookmark_client = new ChromeBookmarkClient(profile);
+  bookmark_client->model()->Load(
+      profile->GetPrefs(),
+      profile->GetPath(),
+      StartupTaskRunnerServiceFactory::GetForProfile(profile)
+          ->GetBookmarkTaskRunner(),
+      content::BrowserThread::GetMessageLoopProxyForThread(
+          content::BrowserThread::UI));
 #if !defined(OS_ANDROID)
   if (CommandLine::ForCurrentProcess()->HasSwitch(
      switches::kEnableBookmarkUndo)) {
-    bookmark_model->AddObserver(
+    bookmark_client->model()->AddObserver(
         BookmarkUndoServiceFactory::GetForProfile(profile));
   }
 #endif  // !defined(OS_ANDROID)
-  return bookmark_model;
+  return bookmark_client;
 }
 
 void BookmarkModelFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   // Don't sync this, as otherwise, due to a limitation in sync, it
   // will cause a deadlock (see http://crbug.com/97955).  If we truly
   // want to sync the expanded state of folders, it should be part of
   // bookmark sync itself (i.e., a property of the sync folder nodes).
   registry->RegisterListPref(prefs::kBookmarkEditorExpandedNodes,
                              new base::ListValue,
                              user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 content::BrowserContext* BookmarkModelFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 bool BookmarkModelFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }