Converting BookmarkModel and HistoryService to ProfileKeyedServices. This just performs the initial…

chrome/browser/history/history.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.
 
 // The history system runs on a background thread so that potentially slow
 // database operations don't delay the browser. This backend processing is
 // represented by HistoryBackend. The HistoryService's job is to dispatch to
 // that thread.
 //
 // Main thread                       History thread
@@ skipping 14 matching lines @@
 #include "chrome/browser/history/history.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/autocomplete/history_url_provider.h"
+#include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/in_memory_database.h"
 #include "chrome/browser/history/in_memory_history_backend.h"
 #include "chrome/browser/history/in_memory_url_index.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/history/visit_database.h"
 #include "chrome/browser/history/visit_filter.h"
@@ skipping 211 matching lines @@
 history::URLDatabase* HistoryService::InMemoryDatabase() {
   // NOTE: See comments in BackendLoaded() as to why we call
   // LoadBackendIfNecessary() here even though it won't affect the return value
   // for this call.
   LoadBackendIfNecessary();
   if (in_memory_backend_.get())
     return in_memory_backend_->db();
   return NULL;
 }
 
+void HistoryService::ShutdownOnUIThread() {
+  // It's possible that bookmarks haven't loaded and history is waiting for
+  // bookmarks to complete loading. In such a situation history can't shutdown
+  // (meaning if we invoked history_service_->Cleanup now, we would
+  // deadlock). To break the deadlock we tell BookmarkModel it's about to be
+  // deleted so that it can release the signal history is waiting on, allowing
+  // history to shutdown (history_service_->Cleanup to complete). In such a
+  // scenario history sees an incorrect view of bookmarks, but it's better
+  // than a deadlock.
+  BookmarkModel* bookmark_model = static_cast<BookmarkModel*>(
+      BookmarkModelFactory::GetForProfileIfExists(profile_));
+  if (bookmark_model)
+    bookmark_model->Shutdown();
+
+  Cleanup();
+}
+
 void HistoryService::SetSegmentPresentationIndex(int64 segment_id, int index) {
   ScheduleAndForget(PRIORITY_UI,
                     &HistoryBackend::SetSegmentPresentationIndex,
                     segment_id, index);
 }
 
 void HistoryService::SetKeywordSearchTermsForURL(const GURL& url,
                                                  TemplateURLID keyword_id,
                                                  const string16& term) {
   ScheduleAndForget(PRIORITY_UI,
@@ skipping 638 matching lines @@
 void HistoryService::RemoveVisitDatabaseObserver(
     history::VisitDatabaseObserver* observer) {
   visit_database_observers_->RemoveObserver(observer);
 }
 
 void HistoryService::NotifyVisitDBObserversOnAddVisit(
     const history::BriefVisitInfo& info) {
   visit_database_observers_->Notify(
       &history::VisitDatabaseObserver::OnAddVisit, info);
 }