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

chrome/browser/prefs/pref_notifier_impl.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/prefs/pref_notifier_impl.h"
 
 #include "base/stl_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_observer.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 
 PrefNotifierImpl::PrefNotifierImpl(PrefService* service)
     : pref_service_(service) {
 }
 
 PrefNotifierImpl::~PrefNotifierImpl() {
   DCHECK(CalledOnValidThread());
 
   // Verify that there are no pref observers when we shut down.
   for (PrefObserverMap::iterator it = pref_observers_.begin();
@@ skipping 49 matching lines @@
   observer_list->RemoveObserver(obs);
 }
 
 void PrefNotifierImpl::OnPreferenceChanged(const std::string& path) {
   FireObservers(path);
 }
 
 void PrefNotifierImpl::OnInitializationCompleted(bool succeeded) {
   DCHECK(CalledOnValidThread());
 
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PREF_INITIALIZATION_COMPLETED,
       content::Source<PrefService>(pref_service_),
       content::Details<bool>(&succeeded));
 }
 
 void PrefNotifierImpl::FireObservers(const std::string& path) {
   DCHECK(CalledOnValidThread());
 
   // Only send notifications for registered preferences.
   if (!pref_service_->FindPreference(path.c_str()))
     return;
 
   const PrefObserverMap::iterator observer_iterator =
       pref_observers_.find(path);
   if (observer_iterator == pref_observers_.end())
     return;
 
   NotificationObserverList::Iterator it(*(observer_iterator->second));
   content::NotificationObserver* observer;
   while ((observer = it.GetNext()) != NULL) {
     observer->Observe(chrome::NOTIFICATION_PREF_CHANGED,
                       content::Source<PrefService>(pref_service_),
                       content::Details<const std::string>(&path));
   }
 }