[Sync] Move attachments code out of core/.

components/sync/api_impl/attachments/attachment_service_impl.cc

 // Copyright 2014 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/core/attachments/attachment_service_impl.h"
+#include "components/sync/api_impl/attachments/attachment_service_impl.h"
 
 #include <iterator>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "components/sync/api/attachments/attachment.h"
-#include "components/sync/core/attachments/fake_attachment_downloader.h"
-#include "components/sync/core/attachments/fake_attachment_uploader.h"
+#include "components/sync/engine/attachments/fake_attachment_downloader.h"
+#include "components/sync/engine/attachments/fake_attachment_uploader.h"
 
 namespace syncer {
 
 // GetOrDownloadAttachments starts multiple parallel DownloadAttachment calls.
 // GetOrDownloadState tracks completion of these calls and posts callback for
 // consumer once all attachments are either retrieved or reported unavailable.
 class AttachmentServiceImpl::GetOrDownloadState
     : public base::RefCounted<GetOrDownloadState>,
       public base::NonThreadSafe {
  public:
@@ skipping 107 matching lines @@
       initial_backoff_delay, max_backoff_delay));
 
   net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
 }
 
 AttachmentServiceImpl::~AttachmentServiceImpl() {
   DCHECK(CalledOnValidThread());
   net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
 }
 
-// Static.
-std::unique_ptr<AttachmentService> AttachmentServiceImpl::CreateForTest() {
-  std::unique_ptr<AttachmentStore> attachment_store =
-      AttachmentStore::CreateInMemoryStore();
-  std::unique_ptr<AttachmentUploader> attachment_uploader(
-      new FakeAttachmentUploader);
-  std::unique_ptr<AttachmentDownloader> attachment_downloader(
-      new FakeAttachmentDownloader());
-  std::unique_ptr<AttachmentService> attachment_service(
-      new AttachmentServiceImpl(
-          attachment_store->CreateAttachmentStoreForSync(),
-          std::move(attachment_uploader), std::move(attachment_downloader),
-          NULL, base::TimeDelta(), base::TimeDelta()));
-  return attachment_service;
-}
-
 void AttachmentServiceImpl::GetOrDownloadAttachments(
     const AttachmentIdList& attachment_ids,
     const GetOrDownloadCallback& callback) {
   DCHECK(CalledOnValidThread());
   scoped_refptr<GetOrDownloadState> state(
       new GetOrDownloadState(attachment_ids, callback));
   // SetModelTypeReference() makes attachments visible for model type.
   // Needed when attachment doesn't have model type reference, but still
   // available in local store.
   attachment_store_->SetModelTypeReference(attachment_ids);
@@ skipping 148 matching lines @@
                                  weak_ptr_factory_.GetWeakPtr()));
   }
 }
 
 void AttachmentServiceImpl::SetTimerForTest(
     std::unique_ptr<base::Timer> timer) {
   upload_task_queue_->SetTimerForTest(std::move(timer));
 }
 
 }  // namespace syncer