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

chrome/browser/password_manager/password_store_default.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/password_manager/password_store_default.h"
 
 #include <set>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "chrome/browser/password_manager/password_store_change.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/browser_thread.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 
 using webkit_glue::PasswordForm;
 
 // MigrateHelper handles migration from WebDB to PasswordStore. It runs
 // entirely on the UI thread and is owned by PasswordStoreDefault.
 class PasswordStoreDefault::MigrateHelper : public WebDataServiceConsumer {
  public:
   MigrateHelper(Profile* profile,
                 WebDataService* web_data_service,
                 PasswordStore* password_store)
@@ skipping 93 matching lines @@
 
 void PasswordStoreDefault::ReportMetricsImpl() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   login_db_->ReportMetrics();
 }
 
 void PasswordStoreDefault::AddLoginImpl(const PasswordForm& form) {
   if (login_db_->AddLogin(form)) {
     PasswordStoreChangeList changes;
     changes.push_back(PasswordStoreChange(PasswordStoreChange::ADD, form));
-    NotificationService::current()->Notify(
+    content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_LOGINS_CHANGED,
         content::Source<PasswordStore>(this),
         content::Details<PasswordStoreChangeList>(&changes));
   }
 }
 
 void PasswordStoreDefault::UpdateLoginImpl(const PasswordForm& form) {
   if (login_db_->UpdateLogin(form, NULL)) {
     PasswordStoreChangeList changes;
     changes.push_back(PasswordStoreChange(PasswordStoreChange::UPDATE, form));
-    NotificationService::current()->Notify(
+    content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_LOGINS_CHANGED,
         content::Source<PasswordStore>(this),
         content::Details<PasswordStoreChangeList>(&changes));
   }
 }
 
 void PasswordStoreDefault::RemoveLoginImpl(const PasswordForm& form) {
   if (login_db_->RemoveLogin(form)) {
     PasswordStoreChangeList changes;
     changes.push_back(PasswordStoreChange(PasswordStoreChange::REMOVE, form));
-    NotificationService::current()->Notify(
+    content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_LOGINS_CHANGED,
         content::Source<PasswordStore>(this),
         content::Details<PasswordStoreChangeList>(&changes));
   }
 }
 
 void PasswordStoreDefault::RemoveLoginsCreatedBetweenImpl(
     const base::Time& delete_begin, const base::Time& delete_end) {
   std::vector<PasswordForm*> forms;
   if (login_db_->GetLoginsCreatedBetween(delete_begin, delete_end, &forms)) {
     if (login_db_->RemoveLoginsCreatedBetween(delete_begin, delete_end)) {
       PasswordStoreChangeList changes;
       for (std::vector<PasswordForm*>::const_iterator it = forms.begin();
            it != forms.end(); ++it) {
         changes.push_back(PasswordStoreChange(PasswordStoreChange::REMOVE,
                                               **it));
       }
-      NotificationService::current()->Notify(
+      content::NotificationService::current()->Notify(
           chrome::NOTIFICATION_LOGINS_CHANGED,
           content::Source<PasswordStore>(this),
           content::Details<PasswordStoreChangeList>(&changes));
     }
   }
   STLDeleteElements(&forms);
 }
 
 void PasswordStoreDefault::GetLoginsImpl(
     GetLoginsRequest* request, const webkit_glue::PasswordForm& form) {
@@ skipping 26 matching lines @@
 }
 
 void PasswordStoreDefault::MigrateIfNecessary() {
   PrefService* prefs = profile_->GetPrefs();
   if (prefs->FindPreference(prefs::kLoginDatabaseMigrated))
     return;
   DCHECK(!migrate_helper_.get());
   migrate_helper_.reset(new MigrateHelper(profile_, web_data_service_, this));
   migrate_helper_->Init();
 }