Delay bookmarks load while the profile is loading.

chrome/browser/bookmarks/bookmark_model.cc

 // Copyright (c) 2012 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/bookmark_model.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/bind.h"
@@ skipping 215 matching lines @@
 
 void BookmarkModel::Shutdown() {
   if (loaded_)
     return;
 
   // See comment in HistoryService::ShutdownOnUIThread where this is invoked for
   // details. It is also called when the BookmarkModel is deleted.
   loaded_signal_.Signal();
 }
 
-void BookmarkModel::Load() {
+void BookmarkModel::Load(scoped_refptr<base::SequencedTaskRunner> task_runner) {

[Miranda Callahan, 2013/03/29 14:40:13]

Do we really need to pass the task_runner here? Now that the task_runner is a
PKS, we can just get it directly anywhere we know what the Profile is. Since you
already have the Profile information here, you can skip passing in the
task_runner, and just pass

StartupTaskRunnerServiceFactory::GetForProfile(profile)->GetBookmarkTaskRunner()

below.

[msarda, 2013/03/29 14:46:24]

I did that in a local change. However, I understood from the other files that we
want the bookmarks to be a component and have less dependency on
chrome/browser/.. code. I used this approach for that reason and for unit tests.

@sky: Let me know what is the approach you guys prefer here and I'll do the
change accordingly.

On 2013/03/29 14:40:13, Miranda Callahan wrote:

   if (store_.get()) {
     // If the store is non-null, it means Load was already invoked. Load should
     // only be invoked once.
     NOTREACHED();
     return;
   }
 
   expanded_state_tracker_.reset(new BookmarkExpandedStateTracker(
       profile_, 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_));
 
   // Load the bookmarks. BookmarkStorage notifies us when done.
-  store_ = new BookmarkStorage(profile_, this, profile_->GetIOTaskRunner());
+  store_ = new BookmarkStorage(profile_, this, task_runner);

[Miranda Callahan, 2013/03/29 14:40:13]

see comment on "Load" above.

   store_->LoadBookmarks(CreateLoadDetails());
 }
 
 bool BookmarkModel::IsLoaded() const {
   return loaded_;
 }
 
 const BookmarkNode* BookmarkModel::GetParentForNewNodes() {
   std::vector<const BookmarkNode*> nodes =
       bookmark_utils::GetMostRecentlyModifiedFolders(this, 1);
@@ skipping 690 matching lines @@
   BookmarkPermanentNode* bb_node =
       CreatePermanentNode(BookmarkNode::BOOKMARK_BAR);
   BookmarkPermanentNode* other_node =
       CreatePermanentNode(BookmarkNode::OTHER_NODE);
   BookmarkPermanentNode* mobile_node =
       CreatePermanentNode(BookmarkNode::MOBILE);
   return new BookmarkLoadDetails(bb_node, other_node, mobile_node,
                                  new BookmarkIndex(profile_),
                                  next_node_id_);
 }