Introduce ChromeBookmarkClientFactory

chrome/browser/bookmarks/chrome_bookmark_client.h

Index: chrome/browser/bookmarks/chrome_bookmark_client.h
diff --git a/chrome/browser/bookmarks/chrome_bookmark_client.h b/chrome/browser/bookmarks/chrome_bookmark_client.h
index bf079d7e234f6357a993402f6f69aee5a9970c77..8891f1d1bbb6fe4e953d74ba913d5f7de52e0540 100644
--- a/chrome/browser/bookmarks/chrome_bookmark_client.h
+++ b/chrome/browser/bookmarks/chrome_bookmark_client.h
@@ -5,10 +5,9 @@
 #ifndef CHROME_BROWSER_BOOKMARKS_CHROME_BOOKMARK_CLIENT_H_
 #define CHROME_BROWSER_BOOKMARKS_CHROME_BOOKMARK_CLIENT_H_
 
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "components/bookmarks/browser/base_bookmark_model_observer.h"
 #include "components/bookmarks/browser/bookmark_client.h"
-#include "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
@@ -17,16 +16,15 @@ class Profile;
 
 class ChromeBookmarkClient : public BookmarkClient,
                              public content::NotificationObserver,
-                             public KeyedService,
                              public BaseBookmarkModelObserver {
-  public:
-  // |index_urls| says whether URLs should be stored in the BookmarkIndex
-  // in addition to bookmark titles.
-  ChromeBookmarkClient(Profile* profile, bool index_urls);
+ public:
+  explicit ChromeBookmarkClient(Profile* profile);
   virtual ~ChromeBookmarkClient();
 
-  // Returns the BookmarkModel that corresponds to this ChromeBookmarkClient.
-  BookmarkModel* model() { return model_.get(); }
+  void Init(BookmarkModel* model);
+
+  // KeyedService:
+  virtual void Shutdown() OVERRIDE;
 
   // BookmarkClient:
   virtual bool PreferTouchIcon() OVERRIDE;
@@ -48,9 +46,6 @@ class ChromeBookmarkClient : public BookmarkClient,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  // KeyedService:
-  virtual void Shutdown() OVERRIDE;
-
  private:
   // BaseBookmarkModelObserver:
   virtual void BookmarkModelChanged() OVERRIDE;
@@ -67,7 +62,7 @@ class ChromeBookmarkClient : public BookmarkClient,
 
   content::NotificationRegistrar registrar_;
 
-  scoped_ptr<BookmarkModel> model_;
+  BookmarkModel* model_;

[blundell, 2014/06/05 09:48:30]

Document lifetime expectations.

[sdefresne, 2014/06/10 13:12:21]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(ChromeBookmarkClient);
 };