Part 1 of merging Extensions and DOMUI

chrome/browser/bookmarks/bookmark_storage.cc

 // Copyright (c) 2006-2008 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_storage.h"
 
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/histogram.h"
 #include "base/json_writer.h"
@@ skipping 167 matching lines @@
     // This happens in unit tests.
     if (model_)
       model_->DoneLoading(details_.release());
     return;
   }
   if (!history->backend_loaded()) {
     // The backend isn't finished loading. Wait for it.
     notification_registrar_.Add(this, NotificationType::HISTORY_LOADED,
                                 Source<Profile>(profile_));
   } else {
-    DoLoadBookmarks(tmp_history_path_);
+    OnHistoryFinishedWriting();
   }
 }
 
 void BookmarkStorage::OnHistoryFinishedWriting() {
   notification_registrar_.Remove(this, NotificationType::HISTORY_LOADED,
                                  Source<Profile>(profile_));
 
   // This is used when migrating bookmarks data from database to file.
   // History wrote the file for us, and now we want to load data from it.
   DoLoadBookmarks(tmp_history_path_);
@@ skipping 76 matching lines @@
 }
 
 void BookmarkStorage::RunTaskOnBackendThread(Task* task) const {
   if (backend_thread()) {
     backend_thread()->message_loop()->PostTask(FROM_HERE, task);
   } else {
     task->Run();
     delete task;
   }
 }