Introduce ChromeBookmarkClientFactory

chrome/browser/ui/views/bookmarks/bookmark_bar_view.h

Index: chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
index f5bcffacfb9982b281343fb918df0522a469ec48..65ae8e83f62e0d54ecc49ac30dfb520d37097d1e 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
@@ -13,7 +13,6 @@
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "chrome/browser/bookmarks/bookmark_stats.h"
-#include "chrome/browser/bookmarks/chrome_bookmark_client.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar_instructions_delegate.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view_observer.h"
@@ -29,6 +28,7 @@
 #include "ui/views/drag_controller.h"
 
 class BookmarkContextMenu;
+class BookmarkModel;
 class Browser;
 class BrowserView;
 class ChromeBookmarkClient;
@@ -276,8 +276,6 @@ class BookmarkBarView : public DetachableToolbarView,
   // calculating the preferred height.
   void Init();
 
-  BookmarkModel* model() { return client_->model(); }
-
   // NOTE: unless otherwise stated all methods that take an int for an index are
   // in terms of the bookmark bar view. Typically the view index and model index
   // are the same, but they may differ during animations or drag and drop.
@@ -387,8 +385,11 @@ class BookmarkBarView : public DetachableToolbarView,
   // Used for opening urls.
   content::PageNavigator* page_navigator_;
 
-  // ChromeBookmarkClient that owns the model whose entries and folders are
-  // shown in this view. This is owned by the Profile.
+  // BookmarkModel that owns the entries and folders that are shown in this
+  // view. This is owned by the Profile.
+  BookmarkModel* model_;
+
+  // ChromeBookmarkClient. This is owned by the Profile.
   ChromeBookmarkClient* client_;
 
   // Used to manage showing a Menu, either for the most recently bookmarked