Move AttachmentStore ownership to datatype

components/sync_driver/generic_change_processor_unittest.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/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
@@ skipping 29 matching lines @@
   virtual ~MockAttachmentService();
   virtual void StoreAttachments(const syncer::AttachmentList& attachments,
                                 const StoreCallback& callback) OVERRIDE;
   std::vector<syncer::AttachmentList>* attachment_lists();
 
  private:
   std::vector<syncer::AttachmentList> attachment_lists_;
 };
 
 MockAttachmentService::MockAttachmentService()
-    : AttachmentServiceImpl(
-          scoped_ptr<syncer::AttachmentStore>(new syncer::FakeAttachmentStore(
-              base::MessageLoopProxy::current())),
-          scoped_ptr<syncer::AttachmentUploader>(
-              new syncer::FakeAttachmentUploader),
-          scoped_ptr<syncer::AttachmentDownloader>(
-              new syncer::FakeAttachmentDownloader),
-          NULL) {
+    : AttachmentServiceImpl(scoped_refptr<syncer::AttachmentStore>(
+                                new syncer::FakeAttachmentStore(
+                                    base::MessageLoopProxy::current())),
+                            scoped_ptr<syncer::AttachmentUploader>(
+                                new syncer::FakeAttachmentUploader),
+                            scoped_ptr<syncer::AttachmentDownloader>(
+                                new syncer::FakeAttachmentDownloader),
+                            NULL) {
 }
 
 MockAttachmentService::~MockAttachmentService() {
 }
 
 void MockAttachmentService::StoreAttachments(
     const syncer::AttachmentList& attachments,
     const StoreCallback& callback) {
   attachment_lists_.push_back(attachments);
   AttachmentServiceImpl::StoreAttachments(attachments, callback);
@@ skipping 12 matching lines @@
       : attachment_service_(attachment_service.Pass()) {}
 
   virtual base::WeakPtr<syncer::SyncableService> GetSyncableServiceForType(
       syncer::ModelType type) OVERRIDE {
     // Shouldn't be called for this test.
     NOTREACHED();
     return base::WeakPtr<syncer::SyncableService>();
   }
 
   virtual scoped_ptr<syncer::AttachmentService> CreateAttachmentService(
+      const scoped_refptr<syncer::AttachmentStore>& attachment_store,
       const syncer::UserShare& user_share,
       syncer::AttachmentService::Delegate* delegate) OVERRIDE {
     EXPECT_TRUE(attachment_service_ != NULL);
     return attachment_service_.Pass();
   }
 
  private:
   scoped_ptr<syncer::AttachmentService> attachment_service_;
 };
 
@@ skipping 24 matching lines @@
     // Take a pointer and trust that GenericChangeProcessor does not prematurely
     // destroy it.
     mock_attachment_service_ = mock_attachment_service.get();
     sync_factory_.reset(new MockSyncApiComponentFactory(
         mock_attachment_service.PassAs<syncer::AttachmentService>()));
     change_processor_.reset(
         new GenericChangeProcessor(&data_type_error_handler_,
                                    syncable_service_ptr_factory_.GetWeakPtr(),
                                    merge_result_ptr_factory_.GetWeakPtr(),
                                    test_user_share_.user_share(),
-                                   sync_factory_.get()));
+                                   sync_factory_.get(),
+                                   scoped_refptr<syncer::AttachmentStore>()));
   }
 
   virtual void TearDown() OVERRIDE {
     mock_attachment_service_ = NULL;
     test_user_share_.TearDown();
   }
 
   void BuildChildNodes(int n) {
     syncer::WriteTransaction trans(FROM_HERE, user_share());
     syncer::ReadNode root(&trans);
@@ skipping 268 matching lines @@
   syncer::ReadNode node(&read_transaction);
   ASSERT_EQ(node.InitByClientTagLookup(syncer::PREFERENCES, tag),
             syncer::BaseNode::INIT_OK);
   syncer::AttachmentIdList attachment_ids = node.GetAttachmentIds();
   EXPECT_EQ(1U, attachment_ids.size());
 }
 
 }  // namespace
 
 }  // namespace sync_driver