Save Android Autofill credentials in the right format.

components/password_manager/core/browser/password_syncable_service.h

 // Copyright 2014 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 COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_SYNCABLE_SERVICE_H__
 #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_SYNCABLE_SERVICE_H__
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/sequence_checker.h"
+#include "base/time/clock.h"
 #include "components/password_manager/core/browser/password_store_change.h"
 #include "components/sync/model/sync_change.h"
 #include "components/sync/model/sync_data.h"
 #include "components/sync/model/sync_error.h"
 #include "components/sync/model/syncable_service.h"
 #include "components/sync/protocol/password_specifics.pb.h"
 #include "components/sync/protocol/sync.pb.h"
 
 namespace autofill {
 struct PasswordForm;
@@ skipping 29 matching lines @@
       const syncer::SyncChangeList& change_list) override;
 
   // Notifies the Sync engine of changes to the password database.
   void ActOnPasswordStoreChanges(const PasswordStoreChangeList& changes);
 
   // Provides a StartSyncFlare to the SyncableService. See
   // chrome/browser/sync/glue/sync_start_util.h for more.
   void InjectStartSyncFlare(
       const syncer::SyncableService::StartSyncFlare& flare);
 
+#if defined(UNIT_TEST)
+  void set_clock(std::unique_ptr<base::Clock> clock) {
+    clock_ = std::move(clock);
+  }
+#endif
+
  private:
   // Map from password sync tag to password form.
   typedef std::map<std::string, autofill::PasswordForm*> PasswordEntryMap;
 
   // The type of PasswordStoreSync::AddLoginImpl,
   // PasswordStoreSync::UpdateLoginImpl and PasswordStoreSync::RemoveLoginImpl.
   typedef PasswordStoreChangeList (PasswordStoreSync::*DatabaseOperation)(
       const autofill::PasswordForm& form);
 
   struct SyncEntries;
 
   // Retrieves the entries from password db and fills both |password_entries|
   // and |passwords_entry_map|. |passwords_entry_map| can be NULL.
   bool ReadFromPasswordStore(
       std::vector<std::unique_ptr<autofill::PasswordForm>>* password_entries,
       PasswordEntryMap* passwords_entry_map) const;
 
   // Uses the |PasswordStore| APIs to change entries.
   void WriteToPasswordStore(const SyncEntries& entries);
 
+  // Goes through |sync_data| and for each entry merges the data with
+  // |unmatched_data_from_password_db|. The result of merge is recorded in
+  // |sync_entries| or |updated_db_entries|. Successfully merged elements are
+  // removed from |unmatched_data_from_password_db|.
+  void MergeSyncDataWithLocalData(
+      const syncer::SyncDataList& sync_data,
+      PasswordEntryMap* unmatched_data_from_password_db,
+      SyncEntries* sync_entries,
+      syncer::SyncChangeList* updated_db_entries);
+
   // Examines |data|, an entry in sync db, and updates |sync_entries| or
   // |updated_db_entries| accordingly. An element is removed from
   // |unmatched_data_from_password_db| if its tag is identical to |data|'s.
-  static void CreateOrUpdateEntry(
-      const syncer::SyncData& data,
-      PasswordEntryMap* unmatched_data_from_password_db,
-      SyncEntries* sync_entries,
-      syncer::SyncChangeList* updated_db_entries);
+  void CreateOrUpdateEntry(const sync_pb::PasswordSpecificsData& data,
+                           PasswordEntryMap* unmatched_data_from_password_db,
+                           SyncEntries* sync_entries,
+                           syncer::SyncChangeList* updated_db_entries);
 
   // Calls |operation| for each element in |entries| and appends the changes to
   // |all_changes|.
   void WriteEntriesToDatabase(
       DatabaseOperation operation,
       const std::vector<std::unique_ptr<autofill::PasswordForm>>& entries,
       PasswordStoreChangeList* all_changes);
 
   // The factory that creates sync errors. |SyncError| has rich data
   // suitable for debugging.
   std::unique_ptr<syncer::SyncErrorFactory> sync_error_factory_;
 
   // |sync_processor_| will mirror the |PasswordStore| changes in the sync db.
   std::unique_ptr<syncer::SyncChangeProcessor> sync_processor_;
 
   // The password store that adds/updates/deletes password entries. Not owned.
   PasswordStoreSync* const password_store_;
 
   // A signal activated by this class to start sync as soon as possible.
   syncer::SyncableService::StartSyncFlare flare_;
 
+  // Clock for date_synced updates.
+  std::unique_ptr<base::Clock> clock_;
+
   // True if processing sync changes is in progress.
   bool is_processing_sync_changes_;
 
   SEQUENCE_CHECKER(sequence_checker_);
 
   DISALLOW_COPY_AND_ASSIGN(PasswordSyncableService);
 };
 
 }  // namespace password_manager
 
 #endif  // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_SYNCABLE_SERVICE_H__