Remove the very old code that migrated password data from the WebDataService to PasswordStore.

chrome/browser/webdata/web_data_service.cc

 // Copyright (c) 2012 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"
@@ skipping 17 matching lines @@
 #include "chrome/browser/webdata/web_intents_table.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.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/forms/form_field.h"
-#include "webkit/forms/password_form.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // WebDataService implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 using base::Bind;
 using base::Time;
 using content::BrowserThread;
 using webkit::forms::FormField;
-using webkit::forms::PasswordForm;
 using webkit_glue::WebIntentServiceData;
 
 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));
 
@@ skipping 329 matching lines @@
       new GenericRequest<std::string>(
           this, GetNextRequestHandle(), consumer, std::string());
   RegisterRequest(request);
   ScheduleTask(FROM_HERE,
                Bind(&WebDataService::GetAllTokensImpl, this, request));
   return request->GetHandle();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Password manager.
-//
-////////////////////////////////////////////////////////////////////////////////
-
-void WebDataService::AddLogin(const PasswordForm& form) {
-  GenericRequest<PasswordForm>* request =
-      new GenericRequest<PasswordForm>(this, GetNextRequestHandle(), NULL,
-                                       form);
-  RegisterRequest(request);
-  ScheduleTask(FROM_HERE, Bind(&WebDataService::AddLoginImpl, this, request));
-}
-
-void WebDataService::UpdateLogin(const PasswordForm& form) {
-  GenericRequest<PasswordForm>* request =
-      new GenericRequest<PasswordForm>(this, GetNextRequestHandle(),
-                                       NULL, form);
-  RegisterRequest(request);
-  ScheduleTask(FROM_HERE,
-               Bind(&WebDataService::UpdateLoginImpl, this, request));
-}
-
-void WebDataService::RemoveLogin(const PasswordForm& form) {
-  GenericRequest<PasswordForm>* request =
-     new GenericRequest<PasswordForm>(this, GetNextRequestHandle(), NULL,
-                                      form);
-  RegisterRequest(request);
-  ScheduleTask(FROM_HERE,
-               Bind(&WebDataService::RemoveLoginImpl, this, request));
-}
-
-void WebDataService::RemoveLoginsCreatedBetween(const Time& delete_begin,
-                                                const Time& delete_end) {
-  GenericRequest2<Time, Time>* request =
-    new GenericRequest2<Time, Time>(this,
-                                    GetNextRequestHandle(),
-                                    NULL,
-                                    delete_begin,
-                                    delete_end);
-  RegisterRequest(request);
-  ScheduleTask(FROM_HERE, Bind(&WebDataService::RemoveLoginsCreatedBetweenImpl,
-                               this, request));
-}
-
-void WebDataService::RemoveLoginsCreatedAfter(const Time& delete_begin) {
-  RemoveLoginsCreatedBetween(delete_begin, Time());
-}
-
-WebDataService::Handle WebDataService::GetLogins(
-                                       const PasswordForm& form,
-                                       WebDataServiceConsumer* consumer) {
-  GenericRequest<PasswordForm>* request =
-      new GenericRequest<PasswordForm>(this, GetNextRequestHandle(),
-                                       consumer, form);
-  RegisterRequest(request);
-  ScheduleTask(FROM_HERE, Bind(&WebDataService::GetLoginsImpl, this, request));
-  return request->GetHandle();
-}
-
-WebDataService::Handle WebDataService::GetAutofillableLogins(
-    WebDataServiceConsumer* consumer) {
-  WebDataRequest* request =
-      new WebDataRequest(this, GetNextRequestHandle(), consumer);
-  RegisterRequest(request);
-  ScheduleTask(FROM_HERE,
-               Bind(&WebDataService::GetAutofillableLoginsImpl, this, request));
-  return request->GetHandle();
-}
-
-WebDataService::Handle WebDataService::GetBlacklistLogins(
-    WebDataServiceConsumer* consumer) {
-  WebDataRequest* request =
-      new WebDataRequest(this, GetNextRequestHandle(), consumer);
-  RegisterRequest(request);
-  ScheduleTask(FROM_HERE,
-               Bind(&WebDataService::GetBlacklistLoginsImpl, this, request));
-  return request->GetHandle();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
 // Autofill.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 void WebDataService::AddFormFields(
     const std::vector<FormField>& fields) {
   GenericRequest<std::vector<FormField> >* request =
       new GenericRequest<std::vector<FormField> >(
           this, GetNextRequestHandle(), NULL, fields);
   RegisterRequest(request);
@@ skipping 614 matching lines @@
     std::map<std::string, std::string> map;
     db_->GetTokenServiceTable()->GetAllTokens(&map);
     request->SetResult(
         new WDResult<std::map<std::string, std::string> >(TOKEN_RESULT, map));
   }
   request->RequestComplete();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-// Password manager implementation.
-//
-////////////////////////////////////////////////////////////////////////////////
-
-void WebDataService::AddLoginImpl(GenericRequest<PasswordForm>* request) {
-  InitializeDatabaseIfNecessary();
-  if (db_ && !request->IsCancelled(NULL)) {
-    if (db_->GetLoginsTable()->AddLogin(request->arg()))
-      ScheduleCommit();
-  }
-  request->RequestComplete();
-}
-
-void WebDataService::UpdateLoginImpl(GenericRequest<PasswordForm>* request) {
-  InitializeDatabaseIfNecessary();
-  if (db_ && !request->IsCancelled(NULL)) {
-    if (db_->GetLoginsTable()->UpdateLogin(request->arg()))
-      ScheduleCommit();
-  }
-  request->RequestComplete();
-}
-
-void WebDataService::RemoveLoginImpl(GenericRequest<PasswordForm>* request) {
-  InitializeDatabaseIfNecessary();
-  if (db_ && !request->IsCancelled(NULL)) {
-    if (db_->GetLoginsTable()->RemoveLogin(request->arg()))
-      ScheduleCommit();
-  }
-  request->RequestComplete();
-}
-
-void WebDataService::RemoveLoginsCreatedBetweenImpl(
-    GenericRequest2<Time, Time>* request) {
-  InitializeDatabaseIfNecessary();
-  if (db_ && !request->IsCancelled(NULL)) {
-    if (db_->GetLoginsTable()->RemoveLoginsCreatedBetween(
-            request->arg1(), request->arg2())) {
-      ScheduleCommit();
-    }
-  }
-  request->RequestComplete();
-}
-
-void WebDataService::GetLoginsImpl(GenericRequest<PasswordForm>* request) {
-  InitializeDatabaseIfNecessary();
-  if (db_ && !request->IsCancelled(NULL)) {
-    std::vector<PasswordForm*> forms;
-    db_->GetLoginsTable()->GetLogins(request->arg(), &forms);
-    request->SetResult(
-        new WDResult<std::vector<PasswordForm*> >(PASSWORD_RESULT, forms));
-  }
-  request->RequestComplete();
-}
-
-void WebDataService::GetAutofillableLoginsImpl(WebDataRequest* request) {
-  InitializeDatabaseIfNecessary();
-  if (db_ && !request->IsCancelled(NULL)) {
-    std::vector<PasswordForm*> forms;
-    db_->GetLoginsTable()->GetAllLogins(&forms, false);
-    request->SetResult(
-        new WDResult<std::vector<PasswordForm*> >(PASSWORD_RESULT, forms));
-  }
-  request->RequestComplete();
-}
-
-void WebDataService::GetBlacklistLoginsImpl(WebDataRequest* request) {
-  InitializeDatabaseIfNecessary();
-  if (db_ && !request->IsCancelled(NULL)) {
-    std::vector<PasswordForm*> all_forms;
-    db_->GetLoginsTable()->GetAllLogins(&all_forms, true);
-    std::vector<PasswordForm*> blacklist_forms;
-    for (std::vector<PasswordForm*>::iterator i = all_forms.begin();
-         i != all_forms.end(); ++i) {
-      scoped_ptr<PasswordForm> form(*i);
-      if (form->blacklisted_by_user) {
-        blacklist_forms.push_back(form.release());
-      }
-    }
-    all_forms.clear();
-    request->SetResult(
-        new WDResult<std::vector<PasswordForm*> >(PASSWORD_RESULT,
-                                                  blacklist_forms));
-  }
-  request->RequestComplete();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
 // Autofill implementation.
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 void WebDataService::AddFormElementsImpl(
     GenericRequest<std::vector<FormField> >* request) {
   InitializeDatabaseIfNecessary();
   if (db_ && !request->IsCancelled(NULL)) {
     AutofillChangeList changes;
     if (!db_->GetAutofillTable()->AddFormFieldValues(
@@ skipping 440 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_));
 }