[Sync] Move attachments code out of core/.

components/sync/driver/sync_api_component_factory_mock.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 "components/sync/driver/sync_api_component_factory_mock.h"
 
 #include <utility>
 
+#include "components/sync/api/attachments/attachment_service.h"
 #include "components/sync/api/attachments/attachment_store.h"
-#include "components/sync/core/attachments/attachment_service_impl.h"
 #include "components/sync/device_info/local_device_info_provider_mock.h"
 #include "components/sync/driver/change_processor.h"
 #include "components/sync/driver/model_associator.h"
 
 using testing::_;
 using testing::InvokeWithoutArgs;
 using testing::Return;
 
 namespace syncer {
 
 SyncApiComponentFactoryMock::SyncApiComponentFactoryMock()
     : local_device_(new LocalDeviceInfoProviderMock()) {}
 
 SyncApiComponentFactoryMock::SyncApiComponentFactoryMock(
     AssociatorInterface* model_associator,
     ChangeProcessor* change_processor)
     : model_associator_(model_associator),
       change_processor_(change_processor),
       local_device_(new LocalDeviceInfoProviderMock()) {}
 
 SyncApiComponentFactoryMock::~SyncApiComponentFactoryMock() {}
 
 std::unique_ptr<AttachmentService>
 SyncApiComponentFactoryMock::CreateAttachmentService(
     std::unique_ptr<AttachmentStoreForSync> attachment_store,
     const UserShare& user_share,
     const std::string& store_birthday,
     ModelType model_type,
     AttachmentService::Delegate* delegate) {
-  return AttachmentServiceImpl::CreateForTest();
+  return AttachmentService::CreateForTest();
 }
 
 SyncApiComponentFactory::SyncComponents
 SyncApiComponentFactoryMock::CreateBookmarkSyncComponents(
     SyncService* sync_service,
     std::unique_ptr<DataTypeErrorHandler> error_handler) {
   return MakeSyncComponents();
 }
 
 SyncApiComponentFactory::SyncComponents
 SyncApiComponentFactoryMock::MakeSyncComponents() {
   return SyncApiComponentFactory::SyncComponents(model_associator_.release(),
                                                  change_processor_.release());
 }
 
 std::unique_ptr<LocalDeviceInfoProvider>
 SyncApiComponentFactoryMock::CreateLocalDeviceInfoProvider() {
   return std::move(local_device_);
 }
 
 void SyncApiComponentFactoryMock::SetLocalDeviceInfoProvider(
     std::unique_ptr<LocalDeviceInfoProvider> local_device) {
   local_device_ = std::move(local_device);
 }
 
 }  // namespace syncer