[Sync] - Upload the callstacks for errors so that the line number of error is in callstack.

chrome/browser/sync/glue/password_model_associator.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_SYNC_GLUE_PASSWORD_MODEL_ASSOCIATOR_H_
 #define CHROME_BROWSER_SYNC_GLUE_PASSWORD_MODEL_ASSOCIATOR_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/history/history_types.h"
+#include "chrome/browser/sync/glue/data_type_error_handler.h"
 #include "chrome/browser/sync/glue/model_associator.h"
 #include "sync/protocol/password_specifics.pb.h"
 
 class MessageLoop;
 class PasswordStore;
 class ProfileSyncService;
 
 namespace webkit {
 namespace forms {
 struct PasswordForm;
@@ skipping 14 matching lines @@
 // * Persisting model associations and loading them back.
 // We do not check if we have local data before this runs; we always
 // merge and sync.
 class PasswordModelAssociator
   : public PerDataTypeAssociatorInterface<std::string, std::string> {
  public:
   typedef std::vector<webkit::forms::PasswordForm> PasswordVector;
 
   static syncable::ModelType model_type() { return syncable::PASSWORDS; }
   PasswordModelAssociator(ProfileSyncService* sync_service,
-                          PasswordStore* password_store);
+                          PasswordStore* password_store,
+                          DataTypeErrorHandler* error_handler);
   virtual ~PasswordModelAssociator();
 
   // PerDataTypeAssociatorInterface implementation.
   //
   // Iterates through the sync model looking for matched pairs of items.
-  virtual bool AssociateModels(SyncError* error) OVERRIDE;
+  virtual SyncError AssociateModels() OVERRIDE;
 
   // Delete all password nodes.
   bool DeleteAllNodes(sync_api::WriteTransaction* trans);
 
   // Clears all associations.
-  virtual bool DisassociateModels(SyncError* error) OVERRIDE;
+  virtual SyncError DisassociateModels() OVERRIDE;
 
   // The has_nodes out param is true if the sync model has nodes other
   // than the permanent tagged nodes.
   virtual bool SyncModelHasUserCreatedNodes(bool* has_nodes) OVERRIDE;
 
   // See ModelAssociator interface.
   virtual void AbortAssociation() OVERRIDE;
 
   // See ModelAssociator interface.
   virtual bool CryptoReadyIfNecessary() OVERRIDE;
@@ skipping 12 matching lines @@
   // Associates the given password name with the given sync id.
   virtual void Associate(const std::string* node, int64 sync_id) OVERRIDE;
 
   // Remove the association that corresponds to the given sync id.
   virtual void Disassociate(int64 sync_id) OVERRIDE;
 
   // Returns whether a node with the given permanent tag was found and update
   // |sync_id| with that node's id.
   virtual bool GetSyncIdForTaggedNode(const std::string& tag, int64* sync_id);
 
-  bool WriteToPasswordStore(const PasswordVector* new_passwords,
-                            const PasswordVector* updated_passwords,
-                            const PasswordVector* deleted_passwords);
+  SyncError WriteToPasswordStore(const PasswordVector* new_passwords,
+                                 const PasswordVector* updated_passwords,
+                                 const PasswordVector* deleted_passwords);
 
   static std::string MakeTag(const webkit::forms::PasswordForm& password);
   static std::string MakeTag(const sync_pb::PasswordSpecificsData& password);
   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 void CopyPassword(const sync_pb::PasswordSpecificsData& password,
@@ skipping 20 matching lines @@
   // Abort association pending flag and lock.  If this is set to true
   // (via the AbortAssociation method), return from the
   // AssociateModels method as soon as possible.
   base::Lock abort_association_pending_lock_;
   bool abort_association_pending_;
 
   MessageLoop* expected_loop_;
 
   PasswordToSyncIdMap id_map_;
   SyncIdToPasswordMap id_map_inverse_;
+  DataTypeErrorHandler* error_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordModelAssociator);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_PASSWORD_MODEL_ASSOCIATOR_H_