Invoke AttachmentUploader and update AttachmentIds.

chrome/browser/sync/glue/shared_change_processor.cc

Index: chrome/browser/sync/glue/shared_change_processor.cc
diff --git a/chrome/browser/sync/glue/shared_change_processor.cc b/chrome/browser/sync/glue/shared_change_processor.cc
index e4e8275f02fb6f1a45b3465ef00660e4b34efdf7..1a122686cef3c5a082f7165b8354ad2e5d546824 100644
--- a/chrome/browser/sync/glue/shared_change_processor.cc
+++ b/chrome/browser/sync/glue/shared_change_processor.cc
@@ -8,10 +8,7 @@
 #include "components/sync_driver/generic_change_processor.h"
 #include "components/sync_driver/generic_change_processor_factory.h"
 #include "components/sync_driver/sync_api_component_factory.h"
-#include "sync/api/attachments/attachment_service.h"
-#include "sync/api/attachments/attachment_service_impl.h"
 #include "sync/api/sync_change.h"
-#include "sync/internal_api/public/attachments/fake_attachment_uploader.h"
 
 using base::AutoLock;
 
@@ -69,23 +66,12 @@ base::WeakPtr<syncer::SyncableService> SharedChangeProcessor::Connect(
     return base::WeakPtr<syncer::SyncableService>();
   }
 
-  // TODO(maniscalco): Use a shared (one per profile) thread-safe instance of
-  // AttachmentUpload instead of creating a new one per AttachmentService (bug
-  // 369536).
-  scoped_ptr<syncer::AttachmentUploader> attachment_uploader(
-      new syncer::FakeAttachmentUploader);
-
-  scoped_ptr<syncer::AttachmentService> attachment_service(
-      new syncer::AttachmentServiceImpl(
-          sync_factory->CreateCustomAttachmentStoreForType(type),
-          attachment_uploader.Pass()));
-
-  generic_change_processor_ = processor_factory->CreateGenericChangeProcessor(
-      user_share,
-      error_handler,
-      local_service,
-      merge_result,
-      attachment_service.Pass()).release();
+  generic_change_processor_ =
+      processor_factory->CreateGenericChangeProcessor(user_share,
+                                                      error_handler,
+                                                      local_service,
+                                                      merge_result,
+                                                      sync_factory).release();
   return local_service;
 }