[Sync] Implementation of model association for passwords using sync API

chrome/browser/password_manager/password_syncable_service.h

 // Copyright 2013 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_PASSWORD_SYNCABLE_SERVICE_H__
 #define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_SYNCABLE_SERVICE_H__
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 13 matching lines @@
 }  // namespace syncer
 
 class PasswordStore;
 
 class PasswordSyncableService : public syncer::SyncableService {
  public:
   explicit PasswordSyncableService(PasswordStore* password_store);
   virtual ~PasswordSyncableService();
 
   typedef std::vector<autofill::PasswordForm*> PasswordVector;
+  typedef std::map<std::string,
+                   std::pair<syncer::SyncChange::SyncChangeType,
+                             std::vector<autofill::PasswordForm*>::iterator > >
+      PasswordEntryMap;
 
   // syncer::SyncableServiceImplementations
   virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
       syncer::ModelType type,
       const syncer::SyncDataList& initial_sync_data,
       scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
       scoped_ptr<syncer::SyncErrorFactory> error_handler) OVERRIDE;
   virtual void StopSyncing(syncer::ModelType type) OVERRIDE;
   virtual syncer::SyncDataList GetAllSyncData(
       syncer::ModelType type) const OVERRIDE;
   virtual syncer::SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
       const syncer::SyncChangeList& change_list) OVERRIDE;
 
   // Static
   static std::string MakeTag(const autofill::PasswordForm& password);
   // Static
   static std::string MakeTag(const sync_pb::PasswordSpecificsData& password);
   // Static
   static std::string MakeTag(const std::string& origin_url,
                              const std::string& username_element,
                              const std::string& username_value,
                              const std::string& password_element,
                              const std::string& signon_realm);
+  // Static

[Nicolas Zea, 2013/10/15 22:04:10]

Rebase onto your other patch?

[lipalani1, 2013/10/18 23:33:03]

Done.

+  static syncer::SyncData PasswordSyncableService::CreateSyncData(
+      const autofill::PasswordForm& password);
+  // Static
+  static void ExtractPasswordFromSpecifics(
+     const sync_pb::PasswordSpecificsData& password,
+     autofill::PasswordForm* new_password);
 
  private:
   bool PasswordSyncableService::WriteToPasswordStore(
       PasswordVector* new_entries,
       PasswordVector* udpated_entries);
 
-  syncer::SyncData PasswordSyncableService::CreateSyncData(
-      const autofill::PasswordForm& password);
+  void CreateOrUpdateEntry(
+      const syncer::SyncData& data,
+      PasswordEntryMap* loaded_data,
+      std::vector<autofill::PasswordForm*>* new_entries,
+      std::vector<autofill::PasswordForm*>* udpated_entries);
+
+  // Virtual so tests can override.
+  virtual void NotifyPasswordStore();
 
   scoped_ptr<syncer::SyncErrorFactory> sync_error_factory_;
   scoped_ptr<syncer::SyncChangeProcessor> sync_processor_;
   scoped_refptr<PasswordStore> password_store_;
 };
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_SYNCABLE_SERVICE_H__