Introduce ChromeBookmarkClientFactory

chrome/browser/bookmarks/chrome_bookmark_client.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_BOOKMARKS_CHROME_BOOKMARK_CLIENT_H_
 #define CHROME_BROWSER_BOOKMARKS_CHROME_BOOKMARK_CLIENT_H_
 
 #include "base/compiler_specific.h"

[tfarina, 2014/06/04 16:02:57]

can you include macros.h instead?

[sdefresne, 2014/06/04 16:08:48]

Done.

 #include "components/bookmarks/browser/base_bookmark_model_observer.h"
 #include "components/bookmarks/browser/bookmark_client.h"
 #include "components/keyed_service/core/keyed_service.h"

[tfarina, 2014/06/04 16:02:57]

can you remove this now?

[sdefresne, 2014/06/04 16:08:48]

Done.

 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class BookmarkModel;
 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;
   virtual base::CancelableTaskTracker::TaskId GetFaviconImageForURL(
       const GURL& page_url,
       int icon_types,
       int desired_size_in_dip,
       const favicon_base::FaviconImageCallback& callback,
       base::CancelableTaskTracker* tracker) OVERRIDE;
   virtual bool SupportsTypedCountForNodes() OVERRIDE;
   virtual void GetTypedCountForNodes(
       const NodeSet& nodes,
       NodeTypedCountPairs* node_typed_count_pairs) OVERRIDE;
   virtual bool IsPermanentNodeVisible(int node_type) OVERRIDE;
   virtual void RecordAction(const base::UserMetricsAction& action) OVERRIDE;
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  // KeyedService:
-  virtual void Shutdown() OVERRIDE;
-
  private:
   // BaseBookmarkModelObserver:
   virtual void BookmarkModelChanged() OVERRIDE;
   virtual void BookmarkNodeRemoved(BookmarkModel* model,
                                    const BookmarkNode* parent,
                                    int old_index,
                                    const BookmarkNode* node,
                                    const std::set<GURL>& removed_urls) OVERRIDE;
   virtual void BookmarkAllNodesRemoved(
       BookmarkModel* model,
       const std::set<GURL>& removed_urls) OVERRIDE;
 
   Profile* profile_;
 
   content::NotificationRegistrar registrar_;
 
-  scoped_ptr<BookmarkModel> model_;
+  BookmarkModel* model_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeBookmarkClient);
 };
 
 #endif  // CHROME_BROWSER_BOOKMARKS_CHROME_BOOKMARK_CLIENT_H_