Eliminate NOTIFICATION_HISTORY_LOADED notification

chrome/browser/history/history_service.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 870 matching lines @@
       base::Bind(callback, base::Owned(result)));
 }
 
 void HistoryService::Cleanup() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!thread_) {
     // We've already cleaned up.
     return;
   }
 
+  NotifyHistoryServiceBeingDeleted();
+
   weak_ptr_factory_.InvalidateWeakPtrs();
 
   // Unload the backend.
   if (history_backend_.get()) {
     // Get rid of the in-memory backend.
     in_memory_backend_.reset();
 
     // Give the InMemoryURLIndex a chance to shutdown.
     // NOTE: In tests, there may be no index.
     if (in_memory_url_index_)
@@ skipping 326 matching lines @@
   // backend has allocated for us. The receiver of the notification will cast
   // this to the proper type.
   content::Details<history::HistoryDetails> det(details.get());
 
   content::NotificationService::current()->Notify(type, source, det);
 }
 
 void HistoryService::OnDBLoaded() {
   DCHECK(thread_checker_.CalledOnValidThread());
   backend_loaded_ = true;
-  content::NotificationService::current()->Notify(
-      chrome::NOTIFICATION_HISTORY_LOADED,
-      content::Source<Profile>(profile_),
-      content::Details<HistoryService>(this));
+  NotifyHistoryServiceLoaded();
 }
 
 bool HistoryService::GetRowForURL(const GURL& url, history::URLRow* url_row) {
   DCHECK(thread_checker_.CalledOnValidThread());
   history::URLDatabase* db = InMemoryDatabase();
   return db && (db->GetRowForURL(url, url_row) != 0);
 }
 
 void HistoryService::NotifyAddVisit(const history::BriefVisitInfo& info) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 11 matching lines @@
                     OnURLVisited(this, transition, row, redirects, visit_time));
 }
 
 void HistoryService::NotifyURLsModified(const history::URLRows& changed_urls) {
   DCHECK(thread_checker_.CalledOnValidThread());
   FOR_EACH_OBSERVER(history::HistoryServiceObserver,
                     observers_,
                     OnURLsModified(this, changed_urls));
 }
 
+void HistoryService::NotifyHistoryServiceLoaded() {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  FOR_EACH_OBSERVER(history::HistoryServiceObserver, observers_,
+                    OnHistoryServiceLoaded(this));
+}
+
+void HistoryService::NotifyHistoryServiceBeingDeleted() {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  FOR_EACH_OBSERVER(history::HistoryServiceObserver, observers_,
+                    HistoryServiceBeingDeleted(this));
+}
+
 scoped_ptr<base::CallbackList<void(const std::set<GURL>&)>::Subscription>
 HistoryService::AddFaviconChangedCallback(
     const HistoryService::OnFaviconChangedCallback& callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   return favicon_changed_callback_list_.Add(callback);
 }
 
 void HistoryService::NotifyFaviconChanged(
     const std::set<GURL>& changed_favicons) {
   DCHECK(thread_checker_.CalledOnValidThread());
   favicon_changed_callback_list_.Notify(changed_favicons);
 }