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

chrome/browser/history/top_sites.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.
 
 #include "chrome/browser/history/top_sites.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/ui/webui/ntp/most_visited_handler.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/thumbnail_score.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/navigation_details.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.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 "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/image/image_util.h"
 
 namespace history {
 
 // How many top sites to store in the cache.
 static const size_t kTopSitesNumber = 20;
@@ skipping 95 matching lines @@
       profile_(profile),
       last_num_urls_changed_(0),
       blacklist_(NULL),
       pinned_urls_(NULL),
       history_state_(HISTORY_LOADING),
       top_sites_state_(TOP_SITES_LOADING),
       loaded_(false) {
   if (!profile_)
     return;
 
-  if (NotificationService::current()) {
+  if (content::NotificationService::current()) {
     registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URLS_DELETED,
                    content::Source<Profile>(profile_));
     // Listen for any nav commits. We'll ignore those not related to this
     // profile when we get the notification.
     registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-                   NotificationService::AllSources());
+                   content::NotificationService::AllSources());
   }
 
   // We create update objects here to be sure that dictionaries are created
   // in the user preferences.
   DictionaryPrefUpdate(profile_->GetPrefs(),
                        prefs::kNTPMostVisitedURLsBlacklist).Get();
   DictionaryPrefUpdate(profile_->GetPrefs(),
                        prefs::kNTPMostVisitedPinnedURLs).Get();
 
   // Now the dictionaries are guaranteed to exist and we can cache pointers
@@ skipping 757 matching lines @@
     // Now that we're loaded we can service the queued up callbacks. Copy them
     // here and service them outside the lock.
     if (!pending_callbacks_.empty()) {
       filtered_urls = thread_safe_cache_->top_sites();
       pending_callbacks.swap(pending_callbacks_);
     }
   }
 
   ProcessPendingCallbacks(pending_callbacks, filtered_urls);
 
-  NotificationService::current()->Notify(chrome::NOTIFICATION_TOP_SITES_LOADED,
-                                         content::Source<Profile>(profile_),
-                                         content::Details<TopSites>(this));
+  content::NotificationService::current()->Notify(
+      chrome::NOTIFICATION_TOP_SITES_LOADED,
+      content::Source<Profile>(profile_),
+      content::Details<TopSites>(this));
 }
 
 void TopSites::ResetThreadSafeCache() {
   base::AutoLock lock(lock_);
   MostVisitedURLList cached;
   ApplyBlacklistAndPinnedURLs(cache_->top_sites(), &cached);
   thread_safe_cache_->SetTopSites(cached);
 }
 
 void TopSites::ResetThreadSafeImageCache() {
   base::AutoLock lock(lock_);
   thread_safe_cache_->SetThumbnails(cache_->images());
   thread_safe_cache_->RemoveUnreferencedThumbnails();
 }
 
 void TopSites::NotifyTopSitesChanged() {
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TOP_SITES_CHANGED,
       content::Source<TopSites>(this),
-      NotificationService::NoDetails());
+      content::NotificationService::NoDetails());
 }
 
 void TopSites::RestartQueryForTopSitesTimer(base::TimeDelta delta) {
   if (timer_.IsRunning() && ((timer_start_time_ + timer_.GetCurrentDelay()) <
                              (base::TimeTicks::Now() + delta))) {
     return;
   }
 
   timer_start_time_ = base::TimeTicks::Now();
   timer_.Stop();
@@ skipping 50 matching lines @@
     }
   }
 }
 
 void TopSites::OnTopSitesAvailableFromHistory(
     CancelableRequestProvider::Handle handle,
     MostVisitedURLList pages) {
   SetTopSites(pages);
 
   // Used only in testing.
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TOP_SITES_UPDATED,
       content::Source<TopSites>(this),
       content::Details<CancelableRequestProvider::Handle>(&handle));
 }
 
 }  // namespace history