Move AttachmentStore ownership to datatype

components/sync_driver/generic_change_processor.h

 // 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.
 
 #ifndef COMPONENTS_SYNC_DRIVER_GENERIC_CHANGE_PROCESSOR_H_
 #define COMPONENTS_SYNC_DRIVER_GENERIC_CHANGE_PROCESSOR_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "components/sync_driver/change_processor.h"
 #include "components/sync_driver/data_type_controller.h"
 #include "components/sync_driver/data_type_error_handler.h"
+#include "sync/api/attachments/attachment_store.h"
 #include "sync/api/sync_change_processor.h"
 #include "sync/api/sync_merge_result.h"
 #include "sync/internal_api/public/attachments/attachment_service.h"
 #include "sync/internal_api/public/attachments/attachment_service_proxy.h"
 
 namespace syncer {
 class SyncData;
 class SyncableService;
 class WriteNode;
 class WriteTransaction;
@@ skipping 16 matching lines @@
                                public syncer::SyncChangeProcessor,
                                public syncer::AttachmentService::Delegate,
                                public base::NonThreadSafe {
  public:
   // Create a change processor and connect it to the syncer.
   GenericChangeProcessor(
       DataTypeErrorHandler* error_handler,
       const base::WeakPtr<syncer::SyncableService>& local_service,
       const base::WeakPtr<syncer::SyncMergeResult>& merge_result,
       syncer::UserShare* user_share,
-      SyncApiComponentFactory* sync_factory);
+      SyncApiComponentFactory* sync_factory,
+      const scoped_refptr<syncer::AttachmentStore>& attachment_store);

[maniscalco, 2014/09/08 21:56:35]

nit: Document that attachment_store can be null.

[pavely, 2014/09/09 23:52:30]

Done.

   virtual ~GenericChangeProcessor();
 
   // ChangeProcessor interface.
   // Build and store a list of all changes into |syncer_changes_|.
   virtual void ApplyChangesFromSyncModel(
       const syncer::BaseTransaction* trans,
       int64 version,
       const syncer::ImmutableChangeRecordList& changes) OVERRIDE;
   // Passes |syncer_changes_|, built in ApplyChangesFromSyncModel, onto
   // |local_service_| by way of its ProcessSyncChanges method.
@@ skipping 78 matching lines @@
   // Set in ApplyChangesFromSyncModel, consumed in CommitChangesFromSyncModel.
   syncer::SyncChangeList syncer_changes_;
 
   // Our handle to the sync model. Unlike normal ChangeProcessors, we need to
   // be able to access the sync model before the change processor begins
   // listening to changes (the local_service_ will be interacting with us
   // when it starts up). As such we can't wait until Start(_) has been called,
   // and have to keep a local pointer to the user_share.
   syncer::UserShare* const share_handle_;
 
   scoped_ptr<syncer::AttachmentService> attachment_service_;

[maniscalco, 2014/09/08 21:56:35]

Can you note that attaachment_service_ may be null.

[pavely, 2014/09/09 23:52:30]

Done.

   // Must be destroyed before attachment_service_ to ensure WeakPtrs are
   // invalidated before attachment_service_ is destroyed.
-  base::WeakPtrFactory<syncer::AttachmentService>
+  scoped_ptr<base::WeakPtrFactory<syncer::AttachmentService> >

[maniscalco, 2014/09/08 21:56:35]

It's probably worth noting that attachment_service_weak_ptr_factory_ itself may
be null.

[pavely, 2014/09/09 23:52:30]

Done.

       attachment_service_weak_ptr_factory_;
-  syncer::AttachmentServiceProxy attachment_service_proxy_;
+  scoped_ptr<syncer::AttachmentServiceProxy> attachment_service_proxy_;
 
   DISALLOW_COPY_AND_ASSIGN(GenericChangeProcessor);
 };
 
 }  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_GENERIC_CHANGE_PROCESSOR_H_