Revert of [Sync] Refactor AttachmentStore classes. Introduce concept of referrer.

components/sync_driver/generic_change_processor.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_driver/generic_change_processor.h"
 
 #include "base/location.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/sync_driver/sync_api_component_factory.h"
@@ skipping 76 matching lines @@
 
 }  // namespace
 
 GenericChangeProcessor::GenericChangeProcessor(
     syncer::ModelType type,
     DataTypeErrorHandler* error_handler,
     const base::WeakPtr<syncer::SyncableService>& local_service,
     const base::WeakPtr<syncer::SyncMergeResult>& merge_result,
     syncer::UserShare* user_share,
     SyncApiComponentFactory* sync_factory,
-    scoped_ptr<syncer::AttachmentStore> attachment_store)
+    const scoped_refptr<syncer::AttachmentStore>& attachment_store)
     : ChangeProcessor(error_handler),
       type_(type),
       local_service_(local_service),
       merge_result_(merge_result),
       share_handle_(user_share),
       weak_ptr_factory_(this) {
   DCHECK(CalledOnValidThread());
   DCHECK_NE(type_, syncer::UNSPECIFIED);
-  if (attachment_store) {
+  if (attachment_store.get()) {
     std::string store_birthday;
     {
       syncer::ReadTransaction trans(FROM_HERE, share_handle());
       store_birthday = trans.GetStoreBirthday();
     }
     attachment_service_ = sync_factory->CreateAttachmentService(
-        attachment_store.Pass(), *user_share, store_birthday, type, this);
+        attachment_store, *user_share, store_birthday, type, this);
     attachment_service_weak_ptr_factory_.reset(
         new base::WeakPtrFactory<syncer::AttachmentService>(
             attachment_service_.get()));
     attachment_service_proxy_ = syncer::AttachmentServiceProxy(
         base::MessageLoopProxy::current(),
         attachment_service_weak_ptr_factory_->GetWeakPtr());
     UploadAllAttachmentsNotOnServer();
   } else {
     attachment_service_proxy_ = syncer::AttachmentServiceProxy(
         base::MessageLoopProxy::current(),
@@ skipping 591 matching lines @@
   }
 }
 
 scoped_ptr<syncer::AttachmentService>
 GenericChangeProcessor::GetAttachmentService() const {
   return scoped_ptr<syncer::AttachmentService>(
       new syncer::AttachmentServiceProxy(attachment_service_proxy_));
 }
 
 }  // namespace sync_driver