Add AttachmentUploader interface and fake implementation.

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 "chrome/browser/sync/profile_sync_service.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/fake_attachment_service.h"
+#include "sync/api/attachments/fake_attachment_uploader.h"
 #include "sync/api/sync_change.h"
 
 using base::AutoLock;
 
 namespace browser_sync {
 
 SharedChangeProcessor::SharedChangeProcessor()
     : disconnected_(false),
       type_(syncer::UNSPECIFIED),
       sync_service_(NULL),
@@ skipping 41 matching lines @@
   sync_service_ = sync_service;
   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);
   // TODO(maniscalco): Replace FakeAttachmentService with a real
   // AttachmentService implementation once implemented (bug 356359).
   scoped_ptr<syncer::AttachmentService> attachment_service(
       new syncer::FakeAttachmentService(
-          sync_factory->CreateCustomAttachmentStoreForType(type)));
+          sync_factory->CreateCustomAttachmentStoreForType(type),
+          attachment_uploader.Pass()));
 
   generic_change_processor_ = processor_factory->CreateGenericChangeProcessor(
       sync_service_->GetUserShare(),
       error_handler,
       local_service,
       merge_result,
       attachment_service.Pass()).release();
   return local_service;
 }
 
@@ skipping 134 matching lines @@
     return error_handler_->CreateAndUploadError(location, message, type_);
   } else {
     return syncer::SyncError(location,
                              syncer::SyncError::DATATYPE_ERROR,
                              message,
                              type_);
   }
 }
 
 }  // namespace browser_sync