Replace calls to 3-arg SyncData::CreateLocalData with 5-arg version.

sync/api/sync_data.h

 // Copyright 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.
 
 #ifndef SYNC_API_SYNC_DATA_H_
 #define SYNC_API_SYNC_DATA_H_
 
 #include <iosfwd>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
+#include "base/memory/ref_counted.h"
 #include "base/stl_util.h"
 #include "base/time/time.h"
 #include "sync/api/attachments/attachment.h"
 #include "sync/api/attachments/attachment_service_proxy.h"
 #include "sync/base/sync_export.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/util/immutable.h"
 #include "sync/internal_api/public/util/weak_handle.h"
 
 namespace sync_pb {
@@ skipping 33 matching lines @@
       const std::string& sync_tag,
       const std::string& non_unique_title,
       const sync_pb::EntitySpecifics& specifics);
   static SyncData CreateLocalDataWithAttachments(
       const std::string& sync_tag,
       const std::string& non_unique_title,
       const sync_pb::EntitySpecifics& specifics,
       const AttachmentList& attachments);
 
   // Helper method for creating SyncData objects originating from the syncer.
-  //
-  // TODO(maniscalco): Replace all calls to 3-arg CreateRemoteData with calls to
-  // the 5-arg version (bug 353296).
   static SyncData CreateRemoteData(
       int64 id,
       const sync_pb::EntitySpecifics& specifics,
       const base::Time& last_modified_time,
       const AttachmentIdList& attachment_ids,
-      const syncer::AttachmentServiceProxy& attachment_service);
-  static SyncData CreateRemoteData(int64 id,
-                                   const sync_pb::EntitySpecifics& specifics,
-                                   const base::Time& last_modified_time);
+      const scoped_refptr<syncer::AttachmentServiceProxy>& attachment_service);
 
   // Whether this SyncData holds valid data. The only way to have a SyncData
   // without valid data is to use the default constructor.
   bool IsValid() const;
 
   // Return the datatype we're holding information about. Derived from the sync
   // datatype specifics.
   ModelType GetDataType() const;
 
   // Return the current sync datatype specifics.
@@ skipping 42 matching lines @@
   int64 id_;
 
   // This may be null if the SyncData represents a deleted item.
   base::Time remote_modification_time_;
 
   // The actual shared sync entity being held.
   ImmutableSyncEntity immutable_entity_;
 
   Immutable<AttachmentList> attachments_;
 
-  AttachmentServiceProxy attachment_service_;
+  scoped_refptr<AttachmentServiceProxy> attachment_service_;
 
  private:
   // Whether this SyncData holds valid data.
   bool is_valid_;
 
   // Clears |entity| and |attachments|.
-  SyncData(int64 id,
-           sync_pb::SyncEntity* entity,
-           AttachmentList* attachments,
-           const base::Time& remote_modification_time,
-           const syncer::AttachmentServiceProxy& attachment_service);
+  SyncData(
+      int64 id,
+      sync_pb::SyncEntity* entity,
+      AttachmentList* attachments,
+      const base::Time& remote_modification_time,
+      const scoped_refptr<syncer::AttachmentServiceProxy>& attachment_service);
 };
 
 // A SyncData going to the syncer.
 class SYNC_EXPORT SyncDataLocal : public SyncData {
  public:
   // Construct a SyncDataLocal from a SyncData.
   //
   // |sync_data|'s IsLocal() must be true.
   explicit SyncDataLocal(const SyncData& sync_data);
   ~SyncDataLocal();
@@ skipping 45 matching lines @@
 };
 
 // gmock printer helper.
 void PrintTo(const SyncData& sync_data, std::ostream* os);
 
 typedef std::vector<SyncData> SyncDataList;
 
 }  // namespace syncer
 
 #endif  // SYNC_API_SYNC_DATA_H_