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

chrome/browser/webdata/web_data_service.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/webdata/web_data_service.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/ui/profile_error_dialog.h"
 #include "chrome/browser/webdata/autofill_change.h"
 #include "chrome/browser/webdata/autofill_entry.h"
 #include "chrome/browser/webdata/autofill_profile_syncable_service.h"
 #include "chrome/browser/webdata/autofill_table.h"
 #include "chrome/browser/webdata/keyword_table.h"
 #include "chrome/browser/webdata/logins_table.h"
 #include "chrome/browser/webdata/token_service_table.h"
 #include "chrome/browser/webdata/web_apps_table.h"
 #include "chrome/browser/webdata/web_intents_table.h"
 #include "chrome/browser/webdata/web_database.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "webkit/glue/form_field.h"
 #include "webkit/glue/password_form.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // WebDataService implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 using base::Bind;
 using base::Time;
 using webkit_glue::FormField;
 using webkit_glue::PasswordForm;
 
 namespace {
 
 // A task used by WebDataService (for Sync mainly) to inform the
 // PersonalDataManager living on the UI thread that it needs to refresh.
 void NotifyOfMultipleAutofillChangesTask(
     const scoped_refptr<WebDataService>& web_data_service) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_AUTOFILL_MULTIPLE_CHANGED,
       content::Source<WebDataService>(web_data_service.get()),
-      NotificationService::NoDetails());
+      content::NotificationService::NoDetails());
 }
 
 }  // namespace
 
 WDAppImagesResult::WDAppImagesResult() : has_all_images(false) {}
 
 WDAppImagesResult::~WDAppImagesResult() {}
 
 WDKeywordsResult::WDKeywordsResult()
   : default_search_provider_id(0),
@@ skipping 564 matching lines @@
 
 void WebDataService::InitializeSyncableServices() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   DCHECK(!autofill_profile_syncable_service_);
 
   autofill_profile_syncable_service_ = new AutofillProfileSyncableService(this);
 }
 
 void WebDataService::NotifyDatabaseLoadedOnUIThread() {
   // Notify that the database has been initialized.
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_WEB_DATABASE_LOADED,
       content::Source<WebDataService>(this),
-      NotificationService::NoDetails());
+      content::NotificationService::NoDetails());
 }
 
 void WebDataService::ShutdownDatabase() {
   should_commit_ = false;
 
   if (db_) {
     db_->CommitTransaction();
     delete db_;
     db_ = NULL;
   }
@@ skipping 366 matching lines @@
       NOTREACHED();
       return;
     }
     request->SetResult(
         new WDResult<AutofillChangeList>(AUTOFILL_CHANGES, changes));
     ScheduleCommit();
 
     // Post the notifications including the list of affected keys.
     // This is sent here so that work resulting from this notification will be
     // done on the DB thread, and not the UI thread.
-    NotificationService::current()->Notify(
+    content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_AUTOFILL_ENTRIES_CHANGED,
         content::Source<WebDataService>(this),
         content::Details<AutofillChangeList>(&changes));
   }
 
   request->RequestComplete();
 }
 
 void WebDataService::GetFormValuesForElementNameImpl(WebDataRequest* request,
     const string16& name, const string16& prefix, int limit) {
@@ skipping 15 matching lines @@
     AutofillChangeList changes;
     if (db_->GetAutofillTable()->RemoveFormElementsAddedBetween(
         request->arg1(), request->arg2(), &changes)) {
       if (!changes.empty()) {
         request->SetResult(
             new WDResult<AutofillChangeList>(AUTOFILL_CHANGES, changes));
 
         // Post the notifications including the list of affected keys.
         // This is sent here so that work resulting from this notification
         // will be done on the DB thread, and not the UI thread.
-        NotificationService::current()->Notify(
+        content::NotificationService::current()->Notify(
             chrome::NOTIFICATION_AUTOFILL_ENTRIES_CHANGED,
             content::Source<WebDataService>(this),
             content::Details<AutofillChangeList>(&changes));
       }
       ScheduleCommit();
     }
   }
   request->RequestComplete();
 }
 
 void WebDataService::RemoveFormValueForElementNameImpl(
     GenericRequest2<string16, string16>* request) {
   InitializeDatabaseIfNecessary();
   if (db_ && !request->IsCancelled(NULL)) {
     const string16& name = request->arg1();
     const string16& value = request->arg2();
 
     if (db_->GetAutofillTable()->RemoveFormElement(name, value)) {
       AutofillChangeList changes;
       changes.push_back(AutofillChange(AutofillChange::REMOVE,
                                        AutofillKey(name, value)));
       request->SetResult(
           new WDResult<AutofillChangeList>(AUTOFILL_CHANGES, changes));
       ScheduleCommit();
 
       // Post the notifications including the list of affected keys.
-      NotificationService::current()->Notify(
+      content::NotificationService::current()->Notify(
           chrome::NOTIFICATION_AUTOFILL_ENTRIES_CHANGED,
           content::Source<WebDataService>(this),
           content::Details<AutofillChangeList>(&changes));
     }
   }
   request->RequestComplete();
 }
 
 void WebDataService::AddAutofillProfileImpl(
     GenericRequest<AutofillProfile>* request) {
   InitializeDatabaseIfNecessary();
   if (db_ && !request->IsCancelled(NULL)) {
     const AutofillProfile& profile = request->arg();
     if (!db_->GetAutofillTable()->AddAutofillProfile(profile)) {
       NOTREACHED();
       return;
     }
     ScheduleCommit();
 
     // Send GUID-based notification.
     AutofillProfileChange change(AutofillProfileChange::ADD,
                                  profile.guid(), &profile);
-    NotificationService::current()->Notify(
+    content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED,
         content::Source<WebDataService>(this),
         content::Details<AutofillProfileChange>(&change));
   }
   request->RequestComplete();
 }
 
 void WebDataService::UpdateAutofillProfileImpl(
     GenericRequest<AutofillProfile>* request) {
   InitializeDatabaseIfNecessary();
@@ skipping 13 matching lines @@
 
     if (!db_->GetAutofillTable()->UpdateAutofillProfileMulti(profile)) {
       NOTREACHED();
       return;
     }
     ScheduleCommit();
 
     // Send GUID-based notification.
     AutofillProfileChange change(AutofillProfileChange::UPDATE,
                                  profile.guid(), &profile);
-    NotificationService::current()->Notify(
+    content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED,
         content::Source<WebDataService>(this),
         content::Details<AutofillProfileChange>(&change));
   }
   request->RequestComplete();
 }
 
 void WebDataService::RemoveAutofillProfileImpl(
     GenericRequest<std::string>* request) {
   InitializeDatabaseIfNecessary();
   if (db_ && !request->IsCancelled(NULL)) {
     const std::string& guid = request->arg();
 
     AutofillProfile* profile = NULL;
     if (!db_->GetAutofillTable()->GetAutofillProfile(guid, &profile)) {
       NOTREACHED();
       return;
     }
     scoped_ptr<AutofillProfile> scoped_profile(profile);
 
     if (!db_->GetAutofillTable()->RemoveAutofillProfile(guid)) {
       NOTREACHED();
       return;
     }
     ScheduleCommit();
 
     // Send GUID-based notification.
     AutofillProfileChange change(AutofillProfileChange::REMOVE, guid, NULL);
-    NotificationService::current()->Notify(
+    content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED,
         content::Source<WebDataService>(this),
         content::Details<AutofillProfileChange>(&change));
   }
   request->RequestComplete();
 }
 
 void WebDataService::GetAutofillProfilesImpl(WebDataRequest* request) {
   InitializeDatabaseIfNecessary();
   if (db_ && !request->IsCancelled(NULL)) {
@@ skipping 16 matching lines @@
       if (!db_->GetAutofillTable()->GetAutofillProfilesInTrash(&guids)) {
         NOTREACHED();
         return;
       }
 
       for (std::vector<std::string>::const_iterator iter = guids.begin();
            iter != guids.end(); ++iter) {
         // Send GUID-based notification.
         AutofillProfileChange change(AutofillProfileChange::REMOVE,
                                      *iter, NULL);
-        NotificationService::current()->Notify(
+        content::NotificationService::current()->Notify(
             chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED,
             content::Source<WebDataService>(this),
             content::Details<AutofillProfileChange>(&change));
       }
 
       // If we trashed any profiles they may have been merged, so send out
       // update notifications as well.
       if (!guids.empty()) {
         std::vector<AutofillProfile*> profiles;
         db_->GetAutofillTable()->GetAutofillProfiles(&profiles);
         for (std::vector<AutofillProfile*>::const_iterator
                 iter = profiles.begin();
              iter != profiles.end(); ++iter) {
           AutofillProfileChange change(AutofillProfileChange::UPDATE,
                                        (*iter)->guid(), *iter);
-          NotificationService::current()->Notify(
+          content::NotificationService::current()->Notify(
               chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED,
               content::Source<WebDataService>(this),
               content::Details<AutofillProfileChange>(&change));
         }
         STLDeleteElements(&profiles);
       }
     }
 
     if (!db_->GetAutofillTable()->EmptyAutofillProfilesTrash()) {
       NOTREACHED();
@@ skipping 11 matching lines @@
     const CreditCard& credit_card = request->arg();
     if (!db_->GetAutofillTable()->AddCreditCard(credit_card)) {
       NOTREACHED();
       return;
     }
     ScheduleCommit();
 
     // Send GUID-based notification.
     AutofillCreditCardChange change(AutofillCreditCardChange::ADD,
                                     credit_card.guid(), &credit_card);
-    NotificationService::current()->Notify(
+    content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_AUTOFILL_CREDIT_CARD_CHANGED,
         content::Source<WebDataService>(this),
         content::Details<AutofillCreditCardChange>(&change));
   }
   request->RequestComplete();
 }
 
 void WebDataService::UpdateCreditCardImpl(
     GenericRequest<CreditCard>* request) {
   InitializeDatabaseIfNecessary();
@@ skipping 12 matching lines @@
 
     if (!db_->GetAutofillTable()->UpdateCreditCard(credit_card)) {
       NOTREACHED();
       return;
     }
     ScheduleCommit();
 
     // Send GUID-based notification.
     AutofillCreditCardChange change(AutofillCreditCardChange::UPDATE,
                                     credit_card.guid(), &credit_card);
-    NotificationService::current()->Notify(
+    content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_AUTOFILL_CREDIT_CARD_CHANGED,
         content::Source<WebDataService>(this),
         content::Details<AutofillCreditCardChange>(&change));
   }
   request->RequestComplete();
 }
 
 void WebDataService::RemoveCreditCardImpl(
     GenericRequest<std::string>* request) {
   InitializeDatabaseIfNecessary();
   if (db_ && !request->IsCancelled(NULL)) {
     const std::string& guid = request->arg();
     if (!db_->GetAutofillTable()->RemoveCreditCard(guid)) {
       NOTREACHED();
       return;
     }
     ScheduleCommit();
 
     // Send GUID-based notification.
     AutofillCreditCardChange change(AutofillCreditCardChange::REMOVE, guid,
                                     NULL);
-    NotificationService::current()->Notify(
+    content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_AUTOFILL_CREDIT_CARD_CHANGED,
         content::Source<WebDataService>(this),
         content::Details<AutofillCreditCardChange>(&change));
   }
   request->RequestComplete();
 }
 
 void WebDataService::GetCreditCardsImpl(WebDataRequest* request) {
   InitializeDatabaseIfNecessary();
   if (db_ && !request->IsCancelled(NULL)) {
@@ skipping 15 matching lines @@
     if (db_->GetAutofillTable()->
         RemoveAutofillProfilesAndCreditCardsModifiedBetween(
             request->arg1(),
             request->arg2(),
             &profile_guids,
             &credit_card_guids)) {
       for (std::vector<std::string>::iterator iter = profile_guids.begin();
            iter != profile_guids.end(); ++iter) {
         AutofillProfileChange change(AutofillProfileChange::REMOVE, *iter,
                                      NULL);
-        NotificationService::current()->Notify(
+        content::NotificationService::current()->Notify(
             chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED,
             content::Source<WebDataService>(this),
             content::Details<AutofillProfileChange>(&change));
       }
 
       for (std::vector<std::string>::iterator iter = credit_card_guids.begin();
            iter != credit_card_guids.end(); ++iter) {
         AutofillCreditCardChange change(AutofillCreditCardChange::REMOVE,
                                         *iter, NULL);
-        NotificationService::current()->Notify(
+        content::NotificationService::current()->Notify(
             chrome::NOTIFICATION_AUTOFILL_CREDIT_CARD_CHANGED,
             content::Source<WebDataService>(this),
             content::Details<AutofillCreditCardChange>(&change));
       }
       // Note: It is the caller's responsibility to post notifications for any
       // changes, e.g. by calling the Refresh() method of PersonalDataManager.
       ScheduleCommit();
     }
   }
   request->RequestComplete();
@@ skipping 51 matching lines @@
 }
 
 const WDTypedResult* WebDataService::WebDataRequest::GetResult() const {
   return result_;
 }
 
 void WebDataService::WebDataRequest::RequestComplete() {
   message_loop_->PostTask(FROM_HERE, Bind(&WebDataService::RequestCompleted,
                                           service_.get(), handle_));
 }