Revert of Refactor FakeAttachmentStore

sync/BUILD.gn

Index: sync/BUILD.gn
diff --git a/sync/BUILD.gn b/sync/BUILD.gn
index d32575b14fbb3ebcc9a98561b2d74fda05252bc8..d5cae95e0ef3f0227717a9e21cc87a37c5fe72d6 100644
--- a/sync/BUILD.gn
+++ b/sync/BUILD.gn
@@ -20,6 +20,8 @@
     "api/attachments/attachment_id.h",
     "api/attachments/attachment_store.cc",
     "api/attachments/attachment_store.h",
+    "api/attachments/fake_attachment_store.cc",
+    "api/attachments/fake_attachment_store.h",
     "api/string_ordinal.h",
     "api/syncable_service.cc",
     "api/syncable_service.h",
@@ -120,12 +122,16 @@
     "internal_api/attachments/attachment_service_impl.cc",
     "internal_api/attachments/attachment_service_proxy.cc",
     "internal_api/attachments/attachment_service_proxy_for_test.cc",
-    "internal_api/attachments/attachment_store_handle.cc",
     "internal_api/attachments/attachment_uploader.cc",
     "internal_api/attachments/attachment_uploader_impl.cc",
     "internal_api/attachments/fake_attachment_downloader.cc",
     "internal_api/attachments/fake_attachment_uploader.cc",
-    "internal_api/attachments/in_memory_attachment_store.cc",
+    "internal_api/attachments/public/attachment_downloader.h",
+    "internal_api/attachments/public/attachment_service.h",
+    "internal_api/attachments/public/attachment_service_impl.h",
+    "internal_api/attachments/public/attachment_service_proxy_for_test.h",
+    "internal_api/attachments/public/attachment_service_proxy.h",
+    "internal_api/attachments/public/attachment_uploader.h",
     "internal_api/base_node.cc",
     "internal_api/base_transaction.cc",
     "internal_api/change_record.cc",
@@ -152,18 +158,10 @@
     "internal_api/js_sync_manager_observer.h",
     "internal_api/protocol_event_buffer.cc",
     "internal_api/protocol_event_buffer.h",
-    "internal_api/public/attachments/attachment_downloader.h",
     "internal_api/public/attachments/attachment_downloader_impl.h",
-    "internal_api/public/attachments/attachment_service.h",
-    "internal_api/public/attachments/attachment_service_impl.h",
-    "internal_api/public/attachments/attachment_service_proxy.h",
-    "internal_api/public/attachments/attachment_service_proxy_for_test.h",
-    "internal_api/public/attachments/attachment_store_handle.h",
-    "internal_api/public/attachments/attachment_uploader.h",
     "internal_api/public/attachments/attachment_uploader_impl.h",
     "internal_api/public/attachments/fake_attachment_downloader.h",
     "internal_api/public/attachments/fake_attachment_uploader.h",
-    "internal_api/public/attachments/in_memory_attachment_store.h",
     "internal_api/public/base/attachment_id_proto.cc",
     "internal_api/public/base/attachment_id_proto.h",
     "internal_api/public/base/cancelation_observer.cc",
@@ -563,7 +561,6 @@
     "internal_api/attachments/attachment_downloader_impl_unittest.cc",
     "internal_api/attachments/attachment_service_impl_unittest.cc",
     "internal_api/attachments/attachment_service_proxy_unittest.cc",
-    "internal_api/attachments/attachment_store_handle_unittest.cc",
     "internal_api/attachments/attachment_uploader_impl_unittest.cc",
     "internal_api/attachments/fake_attachment_downloader_unittest.cc",
     "internal_api/attachments/fake_attachment_uploader_unittest.cc",