Make NotificationService an interface in the content namespace, and switch callers to use it. Mov...

chrome/browser/history/history.cc

 // Copyright (c) 2011 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 31 matching lines @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/profile_error_dialog.h"
 #include "chrome/browser/visitedlink/visitedlink_master.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/download/download_persistent_store_info.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 using base::Time;
 using history::HistoryBackend;
 
 namespace {
 
 static const char* kHistoryThreadName = "Chrome_HistoryThread";
@@ skipping 27 matching lines @@
     message_loop_->PostTask(
         FROM_HERE,
         base::Bind(&HistoryService::SetInMemoryBackend, history_service_.get(),
                    backend_id, backend));
   }
 
   virtual void BroadcastNotifications(
       int type,
       history::HistoryDetails* details) OVERRIDE {
     // Send the notification on the history thread.
-    if (NotificationService::current()) {
+    if (content::NotificationService::current()) {
       content::Details<history::HistoryDetails> det(details);
-      NotificationService::current()->Notify(type,
-                                             content::Source<Profile>(profile_),
-                                             det);
+      content::NotificationService::current()->Notify(
+          type, content::Source<Profile>(profile_), det);
     }
     // Send the notification to the history service on the main thread.
     message_loop_->PostTask(
         FROM_HERE,
         base::Bind(&HistoryService::BroadcastNotifications,
                    history_service_.get(), type, details));
   }
 
   virtual void DBLoaded(int backend_id) OVERRIDE {
     message_loop_->PostTask(
@@ skipping 670 matching lines @@
 
   // The source of all of our notifications is the profile. Note that this
   // pointer is NULL in unit tests.
   content::Source<Profile> source(profile_);
 
   // The details object just contains the pointer to the object that the
   // backend has allocated for us. The receiver of the notification will cast
   // this to the proper type.
   content::Details<history::HistoryDetails> det(details_deleted);
 
-  NotificationService::current()->Notify(type, source, det);
+  content::NotificationService::current()->Notify(type, source, det);
 }
 
 void HistoryService::LoadBackendIfNecessary() {
   if (!thread_ || history_backend_)
     return;  // Failed to init, or already started loading.
 
   ++current_backend_id_;
   scoped_refptr<HistoryBackend> backend(
       new HistoryBackend(history_dir_,
                          current_backend_id_,
                          new BackendDelegate(this, profile_),
                          bookmark_service_));
   history_backend_.swap(backend);
 
   // There may not be a profile when unit testing.
   std::string languages;
   if (profile_) {
     PrefService* prefs = profile_->GetPrefs();
     languages = prefs->GetString(prefs::kAcceptLanguages);
   }
   ScheduleAndForget(PRIORITY_UI, &HistoryBackend::Init, languages, no_db_);
 }
 
 void HistoryService::OnDBLoaded(int backend_id) {
   if (!history_backend_ || current_backend_id_ != backend_id) {
     VLOG(1) << "Message from obsolete backend";
     return;
   }
   backend_loaded_ = true;
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_HISTORY_LOADED,
       content::Source<Profile>(profile_),
       content::Details<HistoryService>(this));
   if (thread_ && profile_) {
     // We don't want to force creation of TopSites.
     history::TopSites* ts = profile_->GetTopSitesWithoutCreating();
     if (ts)
       ts->HistoryLoaded();
   }
 }
 
 void HistoryService::StartTopSitesMigration(int backend_id) {
   if (!history_backend_ || current_backend_id_ != backend_id) {
     VLOG(1) << "Message from obsolete backend";
     return;
   }
   needs_top_sites_migration_ = true;
   if (thread_ && profile_) {
     // We don't want to force creation of TopSites.
     history::TopSites* ts = profile_->GetTopSitesWithoutCreating();
     if (ts)
       ts->MigrateFromHistory();
   }
 }
 
 void HistoryService::OnTopSitesReady() {
   ScheduleAndForget(PRIORITY_NORMAL,
                     &HistoryBackend::MigrateThumbnailsDatabase);
 }