| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "components/sync_driver/generic_change_processor_factory.h" | 5 #include "components/sync_driver/generic_change_processor_factory.h" |
| 6 | 6 |
| 7 #include "base/memory/ptr_util.h" |
| 7 #include "components/sync_driver/generic_change_processor.h" | 8 #include "components/sync_driver/generic_change_processor.h" |
| 8 #include "sync/api/syncable_service.h" | 9 #include "sync/api/syncable_service.h" |
| 9 | 10 |
| 10 namespace sync_driver { | 11 namespace sync_driver { |
| 11 | 12 |
| 12 | 13 |
| 13 GenericChangeProcessorFactory::GenericChangeProcessorFactory() {} | 14 GenericChangeProcessorFactory::GenericChangeProcessorFactory() {} |
| 14 | 15 |
| 15 GenericChangeProcessorFactory::~GenericChangeProcessorFactory() {} | 16 GenericChangeProcessorFactory::~GenericChangeProcessorFactory() {} |
| 16 | 17 |
| 17 scoped_ptr<GenericChangeProcessor> | 18 std::unique_ptr<GenericChangeProcessor> |
| 18 GenericChangeProcessorFactory::CreateGenericChangeProcessor( | 19 GenericChangeProcessorFactory::CreateGenericChangeProcessor( |
| 19 syncer::ModelType type, | 20 syncer::ModelType type, |
| 20 syncer::UserShare* user_share, | 21 syncer::UserShare* user_share, |
| 21 DataTypeErrorHandler* error_handler, | 22 DataTypeErrorHandler* error_handler, |
| 22 const base::WeakPtr<syncer::SyncableService>& local_service, | 23 const base::WeakPtr<syncer::SyncableService>& local_service, |
| 23 const base::WeakPtr<syncer::SyncMergeResult>& merge_result, | 24 const base::WeakPtr<syncer::SyncMergeResult>& merge_result, |
| 24 SyncClient* sync_client) { | 25 SyncClient* sync_client) { |
| 25 DCHECK(user_share); | 26 DCHECK(user_share); |
| 26 return make_scoped_ptr(new GenericChangeProcessor( | 27 return base::WrapUnique(new GenericChangeProcessor( |
| 27 type, error_handler, local_service, merge_result, user_share, sync_client, | 28 type, error_handler, local_service, merge_result, user_share, sync_client, |
| 28 local_service->GetAttachmentStoreForSync())); | 29 local_service->GetAttachmentStoreForSync())); |
| 29 } | 30 } |
| 30 | 31 |
| 31 } // namespace sync_driver | 32 } // namespace sync_driver |
| OLD | NEW |