Fix componentization of chrome/browser/bookmarks

chrome/browser/bookmarks/chrome_bookmark_client_factory.cc

Index: chrome/browser/bookmarks/chrome_bookmark_client_factory.cc
diff --git a/chrome/browser/bookmarks/chrome_bookmark_client_factory.cc b/chrome/browser/bookmarks/chrome_bookmark_client_factory.cc
index b97488fcb5068384cec552286a664604a4e386bc..2626f78470cf892cce257b3e9c088c0218dfc41e 100644
--- a/chrome/browser/bookmarks/chrome_bookmark_client_factory.cc
+++ b/chrome/browser/bookmarks/chrome_bookmark_client_factory.cc
@@ -6,10 +6,23 @@
 
 #include "base/memory/singleton.h"
 #include "chrome/browser/bookmarks/chrome_bookmark_client.h"
+#include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
+#include "components/bookmarks/managed/managed_bookmark_service.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 
+namespace {
+
+scoped_ptr<KeyedService> BuildChromeBookmarkClient(
+    content::BrowserContext* context) {
+  Profile* profile = Profile::FromBrowserContext(context);
+  return make_scoped_ptr(new ChromeBookmarkClient(
+      profile, ManagedBookmarkServiceFactory::GetForProfile(profile)));
+}
+
+}  // namespace
+
 // static
 ChromeBookmarkClient* ChromeBookmarkClientFactory::GetForProfile(
     Profile* profile) {
@@ -22,10 +35,17 @@ ChromeBookmarkClientFactory* ChromeBookmarkClientFactory::GetInstance() {
   return Singleton<ChromeBookmarkClientFactory>::get();
 }
 
+// static
+BrowserContextKeyedServiceFactory::TestingFactoryFunction
+ChromeBookmarkClientFactory::GetDefaultFactory() {
+  return &BuildChromeBookmarkClient;
+}
+
 ChromeBookmarkClientFactory::ChromeBookmarkClientFactory()
     : BrowserContextKeyedServiceFactory(
           "ChromeBookmarkClient",
           BrowserContextDependencyManager::GetInstance()) {
+  DependsOn(ManagedBookmarkServiceFactory::GetInstance());
 }
 
 ChromeBookmarkClientFactory::~ChromeBookmarkClientFactory() {
@@ -33,7 +53,7 @@ ChromeBookmarkClientFactory::~ChromeBookmarkClientFactory() {
 
 KeyedService* ChromeBookmarkClientFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
-  return new ChromeBookmarkClient(static_cast<Profile*>(context));
+  return BuildChromeBookmarkClient(context).release();
 }
 
 content::BrowserContext* ChromeBookmarkClientFactory::GetBrowserContextToUse(