BookmarkClient can add extra nodes to BookmarkModel.

components/bookmarks/browser/bookmark_storage.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_storage.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
@@ skipping 35 matching lines @@
       AddBookmarksToIndex(details, node->GetChild(i));
   }
 }
 
 void LoadCallback(const base::FilePath& path,
                   BookmarkStorage* storage,
                   BookmarkLoadDetails* details,
                   base::SequencedTaskRunner* task_runner) {
   startup_metric_utils::ScopedSlowStartupUMA
       scoped_timer("Startup.SlowStartupBookmarksLoad");
+  bool load_index = false;
   bool bookmark_file_exists = base::PathExists(path);
   if (bookmark_file_exists) {
     JSONFileValueSerializer serializer(path);
     scoped_ptr<base::Value> root(serializer.Deserialize(NULL, NULL));
 
     if (root.get()) {
       // Building the index can take a while, so we do it on the background
       // thread.
       int64 max_node_id = 0;
       BookmarkCodec codec;
       TimeTicks start_time = TimeTicks::Now();
       codec.Decode(details->bb_node(), details->other_folder_node(),
                    details->mobile_folder_node(), &max_node_id, *root.get());
       details->set_max_id(std::max(max_node_id, details->max_id()));
       details->set_computed_checksum(codec.computed_checksum());
       details->set_stored_checksum(codec.stored_checksum());
       details->set_ids_reassigned(codec.ids_reassigned());
       details->set_model_meta_info_map(codec.model_meta_info_map());
       details->set_model_sync_transaction_version(
           codec.model_sync_transaction_version());
       UMA_HISTOGRAM_TIMES("Bookmarks.DecodeTime",
                           TimeTicks::Now() - start_time);
 
-      start_time = TimeTicks::Now();
-      AddBookmarksToIndex(details, details->bb_node());
-      AddBookmarksToIndex(details, details->other_folder_node());
-      AddBookmarksToIndex(details, details->mobile_folder_node());
-      UMA_HISTOGRAM_TIMES("Bookmarks.CreateBookmarkIndexTime",
-                          TimeTicks::Now() - start_time);
+      load_index = true;
     }
   }
 
+  // Load any extra root nodes now, after the IDs have been potentially
+  // reassigned.
+  details->LoadExtraNodes();
+
+  // Load the index if there are any bookmarks in the extra nodes.
+  const BookmarkPermanentNodeList& extra_nodes = details->extra_nodes();
+  for (size_t i = 0; i < extra_nodes.size(); ++i) {
+    if (!extra_nodes[i]->empty()) {
+      load_index = true;
+      break;
+    }
+  }
+
+  if (load_index) {
+    TimeTicks start_time = TimeTicks::Now();
+    AddBookmarksToIndex(details, details->bb_node());
+    AddBookmarksToIndex(details, details->other_folder_node());
+    AddBookmarksToIndex(details, details->mobile_folder_node());
+    for (size_t i = 0; i < extra_nodes.size(); ++i)
+      AddBookmarksToIndex(details, extra_nodes[i]);
+    UMA_HISTOGRAM_TIMES("Bookmarks.CreateBookmarkIndexTime",
+                        TimeTicks::Now() - start_time);
+  }
+
   task_runner->PostTask(FROM_HERE,
                         base::Bind(&BookmarkStorage::OnLoadFinished, storage));
 }
 
 }  // namespace
 
 // BookmarkLoadDetails ---------------------------------------------------------
 
 BookmarkLoadDetails::BookmarkLoadDetails(
     BookmarkPermanentNode* bb_node,
     BookmarkPermanentNode* other_folder_node,
     BookmarkPermanentNode* mobile_folder_node,
+    const LoadExtraCallback& load_extra_callback,
     BookmarkIndex* index,
     int64 max_id)
     : bb_node_(bb_node),
       other_folder_node_(other_folder_node),
       mobile_folder_node_(mobile_folder_node),
+      load_extra_callback_(load_extra_callback),
       index_(index),
       model_sync_transaction_version_(
           BookmarkNode::kInvalidSyncTransactionVersion),
       max_id_(max_id),
       ids_reassigned_(false) {
 }
 
 BookmarkLoadDetails::~BookmarkLoadDetails() {
 }
 
+void BookmarkLoadDetails::LoadExtraNodes() {
+  extra_nodes_ = load_extra_callback_.Run(&max_id_);
+}
+
 // BookmarkStorage -------------------------------------------------------------
 
 BookmarkStorage::BookmarkStorage(
     BookmarkModel* model,
     const base::FilePath& profile_path,
     base::SequencedTaskRunner* sequenced_task_runner)
     : model_(model),
       writer_(profile_path.Append(bookmarks::kBookmarksFileName),
               sequenced_task_runner) {
   sequenced_task_runner_ = sequenced_task_runner;
@@ skipping 57 matching lines @@
   }
 
   std::string data;
   if (!SerializeData(&data))
     return false;
   writer_.WriteNow(data);
   return true;
 }
 
 }  // namespace bookmarks