Reland 87645 with clang fixes.

chrome/browser/sync/api/syncable_service_mock.h

Index: chrome/browser/sync/api/syncable_service_mock.h
diff --git a/chrome/browser/sync/api/syncable_service_mock.h b/chrome/browser/sync/api/syncable_service_mock.h
index 29c5e9b538179044269a8171e777dd9fec17eb8f..e1e6bf798e7f5bba399b9f9f6ecd8d51106f4696 100644
--- a/chrome/browser/sync/api/syncable_service_mock.h
+++ b/chrome/browser/sync/api/syncable_service_mock.h
@@ -16,13 +16,15 @@ class SyncableServiceMock : public SyncableService {
   SyncableServiceMock();
   virtual ~SyncableServiceMock();
 
-  MOCK_METHOD3(MergeDataAndStartSyncing, bool(
-      syncable::ModelType, const SyncDataList&,
-      SyncChangeProcessor* sync_processor));
+  MOCK_METHOD3(MergeDataAndStartSyncing,
+               SyncError(syncable::ModelType,
+                         const SyncDataList&,
+                         SyncChangeProcessor* sync_processor));
   MOCK_METHOD1(StopSyncing, void(syncable::ModelType));
-  MOCK_CONST_METHOD1(GetAllSyncData, SyncDataList(syncable::ModelType));
+  MOCK_CONST_METHOD1(GetAllSyncData, SyncDataList(syncable::ModelType type));
   MOCK_METHOD2(ProcessSyncChanges,
-               void(const tracked_objects::Location&, const SyncChangeList&));
+               SyncError(const tracked_objects::Location&,
+                         const SyncChangeList&));
 };
 
 #endif  // CHROME_BROWSER_SYNC_API_SYNCABLE_SERVICE_MOCK_H_