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

chrome/browser/password_manager/password_store_x.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_x.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
 #include "base/bind.h"
 #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/common/pref_names.h"
 #include "content/browser/browser_thread.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 
 using std::vector;
 using webkit_glue::PasswordForm;
 
 PasswordStoreX::PasswordStoreX(LoginDatabase* login_db,
                                Profile* profile,
                                WebDataService* web_data_service,
                                NativeBackend* backend)
     : PasswordStoreDefault(login_db, profile, web_data_service),
       backend_(backend), migration_checked_(!backend), allow_fallback_(false) {
 }
 
 PasswordStoreX::~PasswordStoreX() {
 }
 
 void PasswordStoreX::AddLoginImpl(const PasswordForm& form) {
   CheckMigration();
   if (use_native_backend() && backend_->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));
     allow_fallback_ = false;
   } else if (allow_default_store()) {
     PasswordStoreDefault::AddLoginImpl(form);
   }
 }
 
 void PasswordStoreX::UpdateLoginImpl(const PasswordForm& form) {
   CheckMigration();
   if (use_native_backend() && backend_->UpdateLogin(form)) {
     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));
     allow_fallback_ = false;
   } else if (allow_default_store()) {
     PasswordStoreDefault::UpdateLoginImpl(form);
   }
 }
 
 void PasswordStoreX::RemoveLoginImpl(const PasswordForm& form) {
   CheckMigration();
   if (use_native_backend() && backend_->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));
     allow_fallback_ = false;
   } else if (allow_default_store()) {
     PasswordStoreDefault::RemoveLoginImpl(form);
   }
 }
 
 void PasswordStoreX::RemoveLoginsCreatedBetweenImpl(
     const base::Time& delete_begin,
     const base::Time& delete_end) {
   CheckMigration();
   vector<PasswordForm*> forms;
   if (use_native_backend() &&
       backend_->GetLoginsCreatedBetween(delete_begin, delete_end, &forms) &&
       backend_->RemoveLoginsCreatedBetween(delete_begin, delete_end)) {
     PasswordStoreChangeList changes;
     for (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));
     allow_fallback_ = false;
   } else if (allow_default_store()) {
     PasswordStoreDefault::RemoveLoginsCreatedBetweenImpl(delete_begin,
                                                          delete_end);
   }
   STLDeleteElements(&forms);
 }
@@ skipping 189 matching lines @@
 }  // anonymous namespace
 
 // static
 void PasswordStoreX::SetPasswordsUseLocalProfileId(PrefService* prefs) {
   // This method should work on any thread, but we expect the DB thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           base::Bind(UISetPasswordsUseLocalProfileId, prefs));
 }
 #endif  // !defined(OS_MACOSX) && !defined(OS_CHROMEOS) && defined(OS_POSIX)