Add the ability to save and remove AutoFill profiles from the AutoFillDialog....

chrome/browser/webdata/web_data_service.cc

 // Copyright (c) 2009 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/message_loop.h"
 #include "base/task.h"
 #include "base/thread.h"
 #include "chrome/browser/autofill/autofill_profile.h"
@@ skipping 142 matching lines @@
 void WebDataService::UpdateAutoFillProfile(const AutoFillProfile& profile) {
   GenericRequest<AutoFillProfile>* request =
       new GenericRequest<AutoFillProfile>(
           this, GetNextRequestHandle(), NULL, profile);
   RegisterRequest(request);
   ScheduleTask(NewRunnableMethod(this,
                                  &WebDataService::UpdateAutoFillProfileImpl,
                                  request));
 }
 
-void WebDataService::RemoveAutoFillProfile(const AutoFillProfile& profile) {
-  GenericRequest<AutoFillProfile>* request =
-      new GenericRequest<AutoFillProfile>(
-          this, GetNextRequestHandle(), NULL, profile);
+void WebDataService::RemoveAutoFillProfile(int profile_id) {
+  GenericRequest<int>* request =
+      new GenericRequest<int>(
+          this, GetNextRequestHandle(), NULL, profile_id);
   RegisterRequest(request);
   ScheduleTask(NewRunnableMethod(this,
                                  &WebDataService::RemoveAutoFillProfileImpl,
                                  request));
 }
 
 WebDataService::Handle WebDataService::GetAutoFillProfileForLabel(
     const string16& label, WebDataServiceConsumer* consumer) {
   WebDataRequest* request =
       new WebDataRequest(this, GetNextRequestHandle(), consumer);
   RegisterRequest(request);
   ScheduleTask(
       NewRunnableMethod(this,
                         &WebDataService::GetAutoFillProfileForLabelImpl,
                         request,
                         label));
   return request->GetHandle();
 }
 
+WebDataService::Handle WebDataService::GetAutoFillProfiles(
+    WebDataServiceConsumer* consumer) {
+  WebDataRequest* request =
+      new WebDataRequest(this, GetNextRequestHandle(), consumer);
+  RegisterRequest(request);
+  ScheduleTask(
+      NewRunnableMethod(this,
+                        &WebDataService::GetAutoFillProfilesImpl,
+                        request));
+  return request->GetHandle();
+}
+
 void WebDataService::RequestCompleted(Handle h) {
   pending_lock_.Acquire();
   RequestMap::iterator i = pending_requests_.find(h);
   if (i == pending_requests_.end()) {
     NOTREACHED() << "Request completed called for an unknown request";
     pending_lock_.Release();
     return;
   }
 
   // Take ownership of the request object and remove it from the map.
@@ skipping 269 matching lines @@
     NOTREACHED() << "Cannot initialize the web database";
     failed_init_ = true;
     delete db;
     if (main_loop_) {
       main_loop_->PostTask(FROM_HERE,
           NewRunnableMethod(this, &WebDataService::DBInitFailed, init_status));
     }
     return;
   }
 
+  ChromeThread::PostTask(
+      ChromeThread::UI, FROM_HERE,
+      NewRunnableMethod(this, &WebDataService::NotifyDatabaseLoadedOnUIThread));
+
   db_ = db;
   db_->BeginTransaction();
 }
 
+void WebDataService::NotifyDatabaseLoadedOnUIThread() {
+  // Notify that the database has been initialized.
+  NotificationService::current()->Notify(NotificationType::WEB_DATABASE_LOADED,
+                                         NotificationService::AllSources(),
+                                         NotificationService::NoDetails());
+}
+
 void WebDataService::ShutdownDatabase() {
   should_commit_ = false;
 
   if (db_) {
     db_->CommitTransaction();
     delete db_;
     db_ = NULL;
   }
 }
 
@@ skipping 238 matching lines @@
   if (db_ && !request->IsCancelled()) {
     const AutoFillProfile& profile = request->GetArgument();
     if (!db_->UpdateAutoFillProfile(profile))
       NOTREACHED();
     ScheduleCommit();
   }
   request->RequestComplete();
 }
 
 void WebDataService::RemoveAutoFillProfileImpl(
-    GenericRequest<AutoFillProfile>* request) {
+    GenericRequest<int>* request) {
   InitializeDatabaseIfNecessary();
   if (db_ && !request->IsCancelled()) {
-    const AutoFillProfile& profile = request->GetArgument();
-    if (!db_->RemoveAutoFillProfile(profile))
+    int profile_id = request->GetArgument();
+    if (!db_->RemoveAutoFillProfile(profile_id))
       NOTREACHED();
     ScheduleCommit();
   }
   request->RequestComplete();
 }
 
 void WebDataService::GetAutoFillProfileForLabelImpl(WebDataRequest* request,
                                                     const string16& label) {
   InitializeDatabaseIfNecessary();
   if (db_ && !request->IsCancelled()) {
     AutoFillProfile* profile;
     db_->GetAutoFillProfileForLabel(label, &profile);
     request->SetResult(
         new WDResult<AutoFillProfile>(AUTOFILL_PROFILE_RESULT, *profile));
     delete profile;
   }
   request->RequestComplete();
 }
 
+void WebDataService::GetAutoFillProfilesImpl(WebDataRequest* request) {
+  InitializeDatabaseIfNecessary();
+  if (db_ && !request->IsCancelled()) {
+    std::vector<AutoFillProfile*> profiles;
+    db_->GetAutoFillProfiles(&profiles);
+    request->SetResult(
+        new WDResult<std::vector<AutoFillProfile*> >(AUTOFILL_PROFILES_RESULT,
+                                                     profiles));
+  }
+  request->RequestComplete();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 //
 // Web Apps implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 void WebDataService::SetWebAppImageImpl(
     GenericRequest2<GURL, SkBitmap>* request) {
   InitializeDatabaseIfNecessary();
   if (db_ && !request->IsCancelled()) {
@@ skipping 86 matching lines @@
   Task* t = NewRunnableMethod(s,
                               &WebDataService::RequestCompleted,
                               handle_);
   message_loop_->PostTask(FROM_HERE, t);
 }
 
 int WebDataService::GetNextRequestHandle() {
   AutoLock l(pending_lock_);
   return ++next_request_handle_;
 }