Introduce ChromeBookmarkClientFactory

chrome/browser/bookmarks/bookmark_model_factory.cc

Index: chrome/browser/bookmarks/bookmark_model_factory.cc
diff --git a/chrome/browser/bookmarks/bookmark_model_factory.cc b/chrome/browser/bookmarks/bookmark_model_factory.cc
index 9c6757f11a9f853bcea1f4baa7539f5cf0bea2a4..1009ca7081f04d758ed719dc32201d6da3e515e4 100644
--- a/chrome/browser/bookmarks/bookmark_model_factory.cc
+++ b/chrome/browser/bookmarks/bookmark_model_factory.cc
@@ -10,6 +10,7 @@
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/bookmarks/chrome_bookmark_client.h"
+#include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"
 #include "chrome/browser/omnibox/omnibox_field_trial.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
@@ -27,23 +28,14 @@
 
 // static
 BookmarkModel* BookmarkModelFactory::GetForProfile(Profile* profile) {
-  ChromeBookmarkClient* bookmark_client =
-      GetChromeBookmarkClientForProfile(profile);
-  return bookmark_client ? bookmark_client->model() : NULL;
+  return static_cast<BookmarkModel*>(
+      GetInstance()->GetServiceForBrowserContext(profile, true));
 }
 
 // static
 BookmarkModel* BookmarkModelFactory::GetForProfileIfExists(Profile* profile) {
-  ChromeBookmarkClient* bookmark_client = static_cast<ChromeBookmarkClient*>(
+  return static_cast<BookmarkModel*>(
       GetInstance()->GetServiceForBrowserContext(profile, false));
-  return bookmark_client ? bookmark_client->model() : NULL;
-}
-
-// static
-ChromeBookmarkClient* BookmarkModelFactory::GetChromeBookmarkClientForProfile(
-    Profile* profile) {
-  return static_cast<ChromeBookmarkClient*>(
-      GetInstance()->GetServiceForBrowserContext(profile, true));
 }
 
 // static
@@ -55,23 +47,28 @@ BookmarkModelFactory::BookmarkModelFactory()
     : BrowserContextKeyedServiceFactory(
         "BookmarkModel",
         BrowserContextDependencyManager::GetInstance()) {
+  DependsOn(ChromeBookmarkClientFactory::GetInstance());
+  DependsOn(StartupTaskRunnerServiceFactory::GetInstance());
 }
 
-BookmarkModelFactory::~BookmarkModelFactory() {}
+BookmarkModelFactory::~BookmarkModelFactory() {
+}
 
 KeyedService* BookmarkModelFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   Profile* profile = static_cast<Profile*>(context);
-  ChromeBookmarkClient* bookmark_client = new ChromeBookmarkClient(
-      profile, OmniboxFieldTrial::BookmarksIndexURLsValue());
-  bookmark_client->model()->Load(
-      profile->GetPrefs(),
-      profile->GetPrefs()->GetString(prefs::kAcceptLanguages),
-      profile->GetPath(),
-      StartupTaskRunnerServiceFactory::GetForProfile(profile)
-          ->GetBookmarkTaskRunner(),
-      content::BrowserThread::GetMessageLoopProxyForThread(
-          content::BrowserThread::UI));
+  ChromeBookmarkClient* bookmark_client =
+      ChromeBookmarkClientFactory::GetForProfile(profile);
+  BookmarkModel* bookmark_model = new BookmarkModel(
+      bookmark_client, OmniboxFieldTrial::BookmarksIndexURLsValue());
+  bookmark_client->Init(bookmark_model);
+  bookmark_model->Load(profile->GetPrefs(),
+                       profile->GetPrefs()->GetString(prefs::kAcceptLanguages),
+                       profile->GetPath(),
+                       StartupTaskRunnerServiceFactory::GetForProfile(profile)
+                           ->GetBookmarkTaskRunner(),
+                       content::BrowserThread::GetMessageLoopProxyForThread(
+                           content::BrowserThread::UI));
 #if !defined(OS_ANDROID)
   bool register_bookmark_undo_service_as_observer = true;
 #if !defined(OS_IOS)
@@ -80,11 +77,11 @@ KeyedService* BookmarkModelFactory::BuildServiceInstanceFor(
           switches::kEnableBookmarkUndo);
 #endif  // !defined(OS_IOS)
   if (register_bookmark_undo_service_as_observer) {
-    bookmark_client->model()->AddObserver(
+    bookmark_model->AddObserver(
         BookmarkUndoServiceFactory::GetForProfile(profile));
   }
 #endif  // !defined(OS_ANDROID)
-  return bookmark_client;
+  return bookmark_model;
 }
 
 void BookmarkModelFactory::RegisterProfilePrefs(