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

chrome/browser/sync/glue/generic_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/generic_change_processor.h"
 
 #include "base/location.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 22 matching lines @@
     write_node->SetPasswordSpecifics(
         entity_specifics.password().client_only_encrypted_data());
   } else {
     write_node->SetEntitySpecifics(entity_specifics);
   }
 }
 
 syncer::SyncData BuildRemoteSyncData(
     int64 sync_id,
     const syncer::BaseNode& read_node,
-    const syncer::AttachmentServiceProxy& attachment_service_proxy) {
+    const scoped_refptr<syncer::AttachmentServiceProxy>&
+        attachment_service_proxy) {
   const syncer::AttachmentIdList& attachment_ids = read_node.GetAttachmentIds();
   // Use the specifics of non-password datatypes directly (encryption has
   // already been handled).
   if (read_node.GetModelType() != syncer::PASSWORDS) {
     return syncer::SyncData::CreateRemoteData(sync_id,
                                               read_node.GetEntitySpecifics(),
                                               read_node.GetModificationTime(),
                                               attachment_ids,
                                               attachment_service_proxy);
   }
@@ skipping 17 matching lines @@
     const base::WeakPtr<syncer::SyncableService>& local_service,
     const base::WeakPtr<syncer::SyncMergeResult>& merge_result,
     syncer::UserShare* user_share,
     scoped_ptr<syncer::AttachmentService> attachment_service)
     : ChangeProcessor(error_handler),
       local_service_(local_service),
       merge_result_(merge_result),
       share_handle_(user_share),
       attachment_service_(attachment_service.Pass()),
       attachment_service_weak_ptr_factory_(attachment_service_.get()),
-      attachment_service_proxy_(syncer::AttachmentServiceProxy(
+      attachment_service_proxy_(new syncer::AttachmentServiceProxy(
           base::MessageLoopProxy::current(),
           attachment_service_weak_ptr_factory_.GetWeakPtr())) {
   DCHECK(CalledOnValidThread());
   DCHECK(attachment_service_);
 }
 
 GenericChangeProcessor::~GenericChangeProcessor() {
   DCHECK(CalledOnValidThread());
 }
 
@@ skipping 534 matching lines @@
 void GenericChangeProcessor::StartImpl(Profile* profile) {
   DCHECK(CalledOnValidThread());
 }
 
 syncer::UserShare* GenericChangeProcessor::share_handle() const {
   DCHECK(CalledOnValidThread());
   return share_handle_;
 }
 
 }  // namespace browser_sync