Introduce ChromeBookmarkClientFactory

chrome/browser/bookmarks/chrome_bookmark_client.cc

 // 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.
 
 #include "chrome/browser/bookmarks/chrome_bookmark_client.h"
 
 #include "base/logging.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/favicon/favicon_changed_details.h"
 #include "chrome/browser/favicon/favicon_service.h"
@@ skipping 13 matching lines @@
 void NotifyHistoryOfRemovedURLs(Profile* profile,
                                 const std::set<GURL>& removed_urls) {
   HistoryService* history_service =
       HistoryServiceFactory::GetForProfile(profile, Profile::EXPLICIT_ACCESS);
   if (history_service)
     history_service->URLsNoLongerBookmarked(removed_urls);
 }
 
 }  // namespace
 
-ChromeBookmarkClient::ChromeBookmarkClient(Profile* profile, bool index_urls)
-    : profile_(profile),
-      model_(new BookmarkModel(this, index_urls)) {
+ChromeBookmarkClient::ChromeBookmarkClient(Profile* profile)
+    : profile_(profile), model_(NULL) {
+}
+
+ChromeBookmarkClient::~ChromeBookmarkClient() {
+}
+
+void ChromeBookmarkClient::Init(BookmarkModel* model) {
+  DCHECK(!model_ && model);
+  model_ = model;
   model_->AddObserver(this);
+
   // Listen for changes to favicons so that we can update the favicon of the
   // node appropriately.
   registrar_.Add(this,
                  chrome::NOTIFICATION_FAVICON_CHANGED,
                  content::Source<Profile>(profile_));
 }
 
-ChromeBookmarkClient::~ChromeBookmarkClient() {
-  model_->RemoveObserver(this);
+void ChromeBookmarkClient::Shutdown() {
+  if (model_) {
+    registrar_.RemoveAll();
 
-  registrar_.RemoveAll();
+    model_->RemoveObserver(this);
+    model_ = NULL;
+  }

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

You should call BookmarkClient::Shutdown() here.

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

Done.

 }
 
 bool ChromeBookmarkClient::PreferTouchIcon() {
 #if !defined(OS_IOS)
   return false;
 #else
   return true;
 #endif
 }
 
@@ skipping 65 matching lines @@
       model_->OnFaviconChanged(favicon_details->urls);
       break;
     }
 
     default:
       NOTREACHED();
       break;
   }
 }
 
-void ChromeBookmarkClient::Shutdown() {
-  model_->Shutdown();
-}
-
 void ChromeBookmarkClient::BookmarkModelChanged() {
 }
 
 void ChromeBookmarkClient::BookmarkNodeRemoved(
     BookmarkModel* model,
     const BookmarkNode* parent,
     int old_index,
     const BookmarkNode* node,
     const std::set<GURL>& removed_urls) {
   NotifyHistoryOfRemovedURLs(profile_, removed_urls);
 }
 
 void ChromeBookmarkClient::BookmarkAllNodesRemoved(
     BookmarkModel* model,
     const std::set<GURL>& removed_urls) {
   NotifyHistoryOfRemovedURLs(profile_, removed_urls);
 }