PasswordStore refactoring.

chrome/browser/password_manager/native_backend_kwallet_x.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/password_manager/native_backend_kwallet_x.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 338 matching lines @@
       kept_forms.push_back(all_forms[i]);
   }
 
   // Update the entry in the wallet, possibly deleting it.
   bool ok = SetLoginsList(kept_forms, form.signon_realm, wallet_handle);
 
   STLDeleteElements(&kept_forms);
   return ok;
 }
 
-bool NativeBackendKWallet::RemoveLoginsCreatedBetween(base::Time delete_begin,
-                                                      base::Time delete_end) {
-  password_manager::PasswordStoreChangeList changes;
+bool NativeBackendKWallet::RemoveLoginsCreatedBetween(
+    base::Time delete_begin,
+    base::Time delete_end,
+    password_manager::PasswordStoreChangeList* changes) {
   return RemoveLoginsBetween(
-      delete_begin, delete_end, CREATION_TIMESTAMP, &changes);
+      delete_begin, delete_end, CREATION_TIMESTAMP, changes);
 }
 
 bool NativeBackendKWallet::RemoveLoginsSyncedBetween(
     base::Time delete_begin,
     base::Time delete_end,
     password_manager::PasswordStoreChangeList* changes) {
   return RemoveLoginsBetween(delete_begin, delete_end, SYNC_TIMESTAMP, changes);
 }
 
 bool NativeBackendKWallet::GetLogins(const PasswordForm& form,
                                      PasswordFormList* forms) {
   int wallet_handle = WalletHandle();
   if (wallet_handle == kInvalidKWalletHandle)
     return false;
   return GetLoginsList(forms, form.signon_realm, wallet_handle);
 }
 
-bool NativeBackendKWallet::GetLoginsCreatedBetween(base::Time get_begin,
-                                                   base::Time get_end,
-                                                   PasswordFormList* forms) {
-  int wallet_handle = WalletHandle();
-  if (wallet_handle == kInvalidKWalletHandle)
-    return false;
-  return GetLoginsList(
-      forms, get_begin, get_end, wallet_handle, CREATION_TIMESTAMP);
-}
-
 bool NativeBackendKWallet::GetAutofillableLogins(PasswordFormList* forms) {
   int wallet_handle = WalletHandle();
   if (wallet_handle == kInvalidKWalletHandle)
     return false;
   return GetLoginsList(forms, true, wallet_handle);
 }
 
 bool NativeBackendKWallet::GetBlacklistLogins(PasswordFormList* forms) {
   int wallet_handle = WalletHandle();
   if (wallet_handle == kInvalidKWalletHandle)
@@ skipping 85 matching lines @@
   for (size_t i = 0; i < all_forms.size(); ++i) {
     if (all_forms[i]->blacklisted_by_user == !autofillable)
       forms->push_back(all_forms[i]);
     else
       delete all_forms[i];
   }
 
   return true;
 }
 
-bool NativeBackendKWallet::GetLoginsList(PasswordFormList* forms,
-                                         const base::Time& begin,
-                                         const base::Time& end,
-                                         int wallet_handle,
-                                         TimestampToCompare date_to_compare) {
-  PasswordFormList all_forms;
-  if (!GetAllLogins(&all_forms, wallet_handle))
-    return false;
-
-  // We have to read all the entries, and then filter them here.
-  base::Time autofill::PasswordForm::*date_member =
-      date_to_compare == CREATION_TIMESTAMP
-          ? &autofill::PasswordForm::date_created
-          : &autofill::PasswordForm::date_synced;
-  forms->reserve(forms->size() + all_forms.size());
-  for (size_t i = 0; i < all_forms.size(); ++i) {
-    if (begin <= all_forms[i]->*date_member &&
-        (end.is_null() || all_forms[i]->*date_member < end)) {
-      forms->push_back(all_forms[i]);
-    } else {
-      delete all_forms[i];
-    }
-  }
-
-  return true;
-}
-
 bool NativeBackendKWallet::GetAllLogins(PasswordFormList* forms,
                                         int wallet_handle) {
   // We could probably also use readEntryList here.
   std::vector<std::string> realm_list;
   {
     dbus::MethodCall method_call(kKWalletInterface, "entryList");
     dbus::MessageWriter builder(&method_call);
     builder.AppendInt32(wallet_handle);  // handle
     builder.AppendString(folder_name_);  // folder
     builder.AppendString(app_name_);     // appid
@@ skipping 441 matching lines @@
   }
 
   return handle;
 }
 
 std::string NativeBackendKWallet::GetProfileSpecificFolderName() const {
   // Originally, the folder name was always just "Chrome Form Data".
   // Now we use it to distinguish passwords for different profiles.
   return base::StringPrintf("%s (%d)", kKWalletFolder, profile_id_);
 }