Change ownership of BookmarkClient

components/bookmarks/browser/bookmark_model.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 "components/bookmarks/browser/bookmark_model.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/string_compare.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/strings/string_util.h"
+#include "components/bookmarks/browser/bookmark_client.h"
 #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h"
 #include "components/bookmarks/browser/bookmark_index.h"
 #include "components/bookmarks/browser/bookmark_match.h"
 #include "components/bookmarks/browser/bookmark_model_observer.h"
 #include "components/bookmarks/browser/bookmark_node_data.h"
 #include "components/bookmarks/browser/bookmark_storage.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/favicon_base/favicon_types.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 58 matching lines @@
   }
 
  private:
   icu::Collator* collator_;
 };
 
 }  // namespace
 
 // BookmarkModel --------------------------------------------------------------
 
-BookmarkModel::BookmarkModel(BookmarkClient* client)
-    : client_(client),
+BookmarkModel::BookmarkModel(scoped_ptr<BookmarkClient> bookmark_client)
+    : bookmark_client_(bookmark_client.Pass()),
       loaded_(false),
       root_(GURL()),
       bookmark_bar_node_(nullptr),
       other_node_(nullptr),
       mobile_node_(nullptr),
       managed_node_(nullptr),
       supervised_node_(nullptr),
       next_node_id_(1),
       observers_(
           base::ObserverList<BookmarkModelObserver>::NOTIFY_EXISTING_ONLY),
       loaded_signal_(true, false),
       extensive_changes_(0) {
-  DCHECK(client_);
+  DCHECK(bookmark_client_);
+  bookmark_client_->Init(this);
 }
 
 BookmarkModel::~BookmarkModel() {
   FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
                     BookmarkModelBeingDeleted(this));
 
   if (store_.get()) {
     // The store maintains a reference back to us. We need to tell it we're gone
     // so that it doesn't try and invoke a method back on us again.
     store_->BookmarkModelDeleted();
@@ skipping 352 matching lines @@
   if (node == supervised_node_ || node == managed_node_)
     return false;
 #if !defined(OS_IOS)
   return node->type() != BookmarkNode::MOBILE;
 #else
   return node->type() == BookmarkNode::MOBILE;
 #endif
 }
 
 void BookmarkModel::RecordAction(const base::UserMetricsAction& action) {
-  client_->RecordAction(action);
+  bookmark_client_->RecordAction(action);
 }
 
 void BookmarkModel::SetDateAdded(const BookmarkNode* node, Time date_added) {
   DCHECK(node && !is_permanent_node(node));
 
   if (node->date_added() == date_added)
     return;
 
   AsMutable(node)->set_date_added(date_added);
 
@@ skipping 348 matching lines @@
   // TODO(robliao): Remove ScopedTracker below once https://crbug.com/467179
   // is fixed.
   tracked_objects::ScopedTracker tracking_profile6(
       FROM_HERE_WITH_EXPLICIT_FUNCTION("467179 BookmarkModel::DoneLoading6"));
 
   // Notify our direct observers.
   FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
                     BookmarkModelLoaded(this, details->ids_reassigned()));
 
   // Notify client.
-  client_->DoneLoading(managed_node_, supervised_node_);
+  bookmark_client_->DoneLoading(managed_node_, supervised_node_);
 }
 
 void BookmarkModel::RemoveAndDeleteNode(BookmarkNode* delete_me) {
   scoped_ptr<BookmarkNode> node(delete_me);
 
   const BookmarkNode* parent = node->parent();
   DCHECK(parent);
   int index = parent->GetIndexOf(node.get());
   DCHECK_NE(-1, index);
 
@@ skipping 140 matching lines @@
 }
 
 void BookmarkModel::LoadFavicon(BookmarkNode* node,
                                 favicon_base::IconType icon_type) {
   if (node->is_folder())
     return;
 
   DCHECK(node->url().is_valid());
   node->set_favicon_state(BookmarkNode::LOADING_FAVICON);
   base::CancelableTaskTracker::TaskId taskId =
-      client_->GetFaviconImageForPageURL(
+      bookmark_client_->GetFaviconImageForPageURL(
           node->url(),
           icon_type,
           base::Bind(
               &BookmarkModel::OnFaviconDataAvailable,
               base::Unretained(this),
               node,
               icon_type),
           &cancelable_task_tracker_);
   if (taskId != base::CancelableTaskTracker::kBadTaskId)
     node->set_favicon_load_task_id(taskId);
@@ skipping 34 matching lines @@
       CreatePermanentNode(BookmarkNode::MOBILE);
   // Create the managed_node and supervised_node with a temporary id of 0 now.
   // They will be populated and assigned property ids by the LoadExtraCallback
   // returned by GetLoadExtraNodesCallback(). Ownership of the node is
   // transferred to the closure.
   scoped_ptr<BookmarkPermanentNode> managed_node(new BookmarkPermanentNode(0));
   scoped_ptr<BookmarkPermanentNode> supervised_node(
       new BookmarkPermanentNode(0));
   return scoped_ptr<BookmarkLoadDetails>(new BookmarkLoadDetails(
       bb_node, other_node, mobile_node,
-      client_->GetLoadExtraNodesCallback(
+      bookmark_client_->GetLoadExtraNodesCallback(
           managed_node.Pass(), supervised_node.Pass(),
           base::Bind(&BookmarkModel::OnExtraNodeLoaded,
                      base::Unretained(this))),
-      new BookmarkIndex(client_, accept_languages), next_node_id_));
+      new BookmarkIndex(bookmark_client_.get(), accept_languages),
+      next_node_id_));
 }
 
 void BookmarkModel::OnExtraNodeLoaded(BookmarkPermanentNode* managed_node,
                                       BookmarkPermanentNode* supervised_node) {
   managed_node_ = managed_node;
   supervised_node_ = supervised_node;
 }
 
 bool BookmarkModel::IsTopLevelPermanentNode(const BookmarkPermanentNode* node) {
   return node->type() == BookmarkNode::BOOKMARK_BAR ||
@@ skipping 15 matching lines @@
 
 bool BookmarkModel::PreferTouchIcon() {
 #if !defined(OS_IOS)
   return false;
 #else
   return true;
 #endif
 }
 
 }  // namespace bookmarks