[Sync] Add support for sync Persistence Errors

sync/api/sync_merge_result_unittest.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"
 
 #include "base/location.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 
 namespace {
 
 typedef testing::Test SyncMergeResultTest;
 
 TEST_F(SyncMergeResultTest, Unset) {
   SyncMergeResult merge_result(BOOKMARKS);
   EXPECT_FALSE(merge_result.error().IsSet());
   EXPECT_EQ(0, merge_result.num_items_before_association());
   EXPECT_EQ(0, merge_result.num_items_after_association());
   EXPECT_EQ(0, merge_result.num_items_added());
   EXPECT_EQ(0, merge_result.num_items_deleted());
   EXPECT_EQ(0, merge_result.num_items_modified());
 }
 
 TEST_F(SyncMergeResultTest, SetError) {
-  SyncError error(FROM_HERE, "message", BOOKMARKS);
+  SyncError error(FROM_HERE, SyncError::DATATYPE_ERROR, "message", BOOKMARKS);
   SyncMergeResult merge_result(BOOKMARKS);
 
   merge_result.set_error(error);
   EXPECT_TRUE(merge_result.error().IsSet());
   EXPECT_EQ(BOOKMARKS, merge_result.model_type());
 }
 
 TEST_F(SyncMergeResultTest, SetNumItemsBeforeAssociation) {
   SyncMergeResult merge_result(BOOKMARKS);
   EXPECT_EQ(0, merge_result.num_items_before_association());
@@ skipping 30 matching lines @@
   SyncMergeResult merge_result(BOOKMARKS);
   EXPECT_EQ(0, merge_result.num_items_modified());
 
   merge_result.set_num_items_modified(10);
   EXPECT_EQ(10, merge_result.num_items_modified());
 }
 
 }  // namespace
 
 }  // namespace syncer