Invoke AttachmentUploader and update AttachmentIds.

chrome/browser/sync/glue/shared_change_processor.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 "chrome/browser/sync/glue/shared_change_processor.h"
 
 #include "base/message_loop/message_loop_proxy.h"
 #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;
 
 namespace browser_sync {
 
 SharedChangeProcessor::SharedChangeProcessor()
     : disconnected_(false),
       type_(syncer::UNSPECIFIED),
       frontend_loop_(base::MessageLoopProxy::current()),
       generic_change_processor_(NULL),
@@ skipping 37 matching lines @@
   type_ = type;
   error_handler_ = error_handler;
   base::WeakPtr<syncer::SyncableService> local_service =
       sync_factory->GetSyncableServiceForType(type);
   if (!local_service.get()) {
     LOG(WARNING) << "SyncableService destroyed before DTC was stopped.";
     disconnected_ = true;
     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;
 }
 
 bool SharedChangeProcessor::Disconnect() {
   // May be called from any thread.
   DVLOG(1) << "Disconnecting change processor.";
   AutoLock lock(monitor_lock_);
   bool was_connected = !disconnected_;
   disconnected_ = true;
   error_handler_ = NULL;
@@ skipping 117 matching lines @@
     return error_handler_->CreateAndUploadError(location, message, type_);
   } else {
     return syncer::SyncError(location,
                              syncer::SyncError::DATATYPE_ERROR,
                              message,
                              type_);
   }
 }
 
 }  // namespace browser_sync