[Sync] Add support for sync Persistence Errors

sync/api/sync_merge_result.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 "sync/api/sync_merge_result.h"
 
 namespace syncer {
 
 SyncMergeResult::SyncMergeResult(ModelType type)
   : model_type_(type),
     num_items_before_association_(0),
     num_items_after_association_(0),
     num_items_added_(0),
     num_items_deleted_(0),
     num_items_modified_(0),
     pre_association_version_(0) {
 }
 
 SyncMergeResult::~SyncMergeResult() {
 }
 
 // Setters.
 void SyncMergeResult::set_error(SyncError error) {
-  DCHECK(!error.IsSet() || model_type_ == error.type());
+  DCHECK(!error.IsSet() || model_type_ == error.model_type());
   error_ = error;
 }
 
 void SyncMergeResult::set_num_items_before_association(
     int  num_items_before_association) {
   num_items_before_association_ = num_items_before_association;
 }
 
 void SyncMergeResult::set_num_items_after_association(
     int num_items_after_association) {
@@ skipping 42 matching lines @@
 
 int SyncMergeResult::num_items_modified() const {
   return num_items_modified_;
 }
 
 int64 SyncMergeResult::pre_association_version() const {
   return pre_association_version_;
 }
 
 }  // namespace syncer