PasswordStore: Clean up expectations about rewriting vectors of forms

chrome/browser/password_manager/native_backend_kwallet_x.h

 // 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.
 
 #ifndef CHROME_BROWSER_PASSWORD_MANAGER_NATIVE_BACKEND_KWALLET_X_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_NATIVE_BACKEND_KWALLET_X_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 49 matching lines @@
       ScopedVector<autofill::PasswordForm>* forms) override;
   bool GetBlacklistLogins(ScopedVector<autofill::PasswordForm>* forms) override;
 
  protected:
   // Invalid handle returned by WalletHandle().
   static const int kInvalidKWalletHandle = -1;
 
   // Internally used by Init(), but also for testing to provide a mock bus.
   bool InitWithBus(scoped_refptr<dbus::Bus> optional_bus);
 
-  // Deserializes a list of PasswordForms from the wallet.
-  static void DeserializeValue(const std::string& signon_realm,
-                               const Pickle& pickle,
-                               ScopedVector<autofill::PasswordForm>* forms);
+  // Deserializes a list of PasswordForms from the wallet. Protected for tests.

[engedy, 2015/02/25 15:17:48]

Nit: What does "protected for tests" mean?

[vabr (Chromium), 2015/03/09 10:56:18]

It meant: "Protected, instead of private, so that tests can call it directly."
But that's about the only reason anything here is protected, so I dropped that
sentence again.

[engedy, 2015/03/09 13:33:17]

Acknowledged.

+  static ScopedVector<autofill::PasswordForm> DeserializeValue(
+      const std::string& signon_realm,
+      const Pickle& pickle);
 
  private:
   enum InitResult {
     INIT_SUCCESS,    // Init succeeded.
     TEMPORARY_FAIL,  // Init failed, but might succeed after StartKWalletd().
     PERMANENT_FAIL   // Init failed, and is not likely to work later either.
   };
 
   enum TimestampToCompare {
     CREATION_TIMESTAMP,
     SYNC_TIMESTAMP,
   };
 
+  enum class BlacklistOptions { AUTOFILLABLE, BLACKLISTED };
+
   // Initialization.
   bool StartKWalletd();
   InitResult InitWallet();
   void InitOnDBThread(scoped_refptr<dbus::Bus> optional_bus,
                       base::WaitableEvent* event,
                       bool* success);
 
-  // Reads PasswordForms from the wallet that match the given signon_realm.
+  // Overwrites |forms| with all credentials matching |signon_realm|. On success
+  // returns true, on failure returns false and erases |forms|.
   bool GetLoginsList(const std::string& signon_realm,
                      int wallet_handle,
                      ScopedVector<autofill::PasswordForm>* forms);
 
-  // Reads PasswordForms from the wallet with the given autofillability state.
-  bool GetLoginsList(bool autofillable,
+  // Overwrites |forms| with all credentials matching |options|. On success
+  // returns true, on failure returns false and erases |forms|.
+  bool GetLoginsList(BlacklistOptions options,
                      int wallet_handle,
                      ScopedVector<autofill::PasswordForm>* forms);
 
-  // Helper for some of the above GetLoginsList() methods.
+  // Overwrites |forms| with all stored credentials. On success returns true, on
+  // failure returns false and erases |forms|.
   bool GetAllLogins(int wallet_handle,
                     ScopedVector<autofill::PasswordForm>* forms);
 
   // Writes a list of PasswordForms to the wallet with the given signon_realm.
   // Overwrites any existing list for this signon_realm. Removes the entry if
   // |forms| is empty. Returns true on success.
   bool SetLoginsList(const std::vector<autofill::PasswordForm*>& forms,
                      const std::string& signon_realm,
                      int wallet_handle);
 
   // Removes password created/synced in the time interval. Returns |true| if the
   // operation succeeded. |changes| will contain the changes applied.
   bool RemoveLoginsBetween(base::Time delete_begin,
                            base::Time delete_end,
                            TimestampToCompare date_to_compare,
                            password_manager::PasswordStoreChangeList* changes);
 
   // Opens the wallet and ensures that the "Chrome Form Data" folder exists.
   // Returns kInvalidWalletHandle on error.
   int WalletHandle();
 
-  // Serializes a list of PasswordForms to be stored in the wallet.
-  static void SerializeValue(const std::vector<autofill::PasswordForm*>& forms,
-                             Pickle* pickle);
-
-  // Deserializes a list of PasswordForms from the wallet.
-  // |size_32| controls reading the size field within the pickle as 32 bits.
-  // We used to use Pickle::WriteSize() to write the number of password forms,
-  // but that has a different size on 32- and 64-bit systems. So, now we always
-  // write a 64-bit quantity, but we support trying to read it as either size
-  // when reading old pickles that fail to deserialize using the native size.
-  static bool DeserializeValueSize(const std::string& signon_realm,
-                                   const PickleIterator& iter,
-                                   int version,
-                                   bool size_32,
-                                   bool warn_only,
-                                   ScopedVector<autofill::PasswordForm>* forms);
-
-  // In case the fields in the pickle ever change, version them so we can try to
-  // read old pickles. (Note: do not eat old pickles past the expiration date.)
-  static const int kPickleVersion = 6;
-
   // Generates a profile-specific folder name based on profile_id_.
   std::string GetProfileSpecificFolderName() const;
 
   // The local profile id, used to generate the folder name.
   const LocalProfileId profile_id_;
 
   // The KWallet folder name, possibly based on the local profile id.
   std::string folder_name_;
 
   // DBus handle for communication with klauncher and kwalletd.
   scoped_refptr<dbus::Bus> session_bus_;
   // Object proxy for kwalletd. We do not own this.
   dbus::ObjectProxy* kwallet_proxy_;
 
   // The name of the wallet we've opened. Set during Init().
   std::string wallet_name_;
   // The application name (e.g. "Chromium"), shown in KWallet auth dialogs.
   const std::string app_name_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeBackendKWallet);
 };
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_NATIVE_BACKEND_KWALLET_X_H_