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

chrome/browser/extensions/app_notification_manager.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/extensions/app_notification_manager.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/stl_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/browser/browser_thread.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 
 AppNotificationManager::AppNotificationManager(Profile* profile)
     : profile_(profile) {
   registrar_.Add(this,
                  chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
                  content::Source<Profile>(profile_));
 }
 
 namespace {
 
@@ skipping 107 matching lines @@
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   NotificationMap::const_iterator i;
   for (i = map.begin(); i != map.end(); ++i) {
     const std::string& id = i->first;
     const AppNotificationList& list = i->second;
     if (list.empty())
       continue;
     notifications_[id].insert(notifications_[id].begin(),
                               list.begin(),
                               list.end());
-    NotificationService::current()->Notify(
+    content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_APP_NOTIFICATION_STATE_CHANGED,
         content::Source<Profile>(profile_),
         content::Details<const std::string>(&id));
   }
 }
 
 void AppNotificationManager::SaveOnFileThread(const std::string& extension_id,
                                               const AppNotificationList& list) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   storage_->Set(extension_id, list);
 }
 
 void AppNotificationManager::DeleteOnFileThread(
     const std::string& extension_id) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   storage_->Delete(extension_id);
 }