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

sync/api/attachments/attachment_service_proxy_for_test.cc

Index: sync/api/attachments/attachment_service_proxy_for_test.cc
diff --git a/sync/api/attachments/attachment_service_proxy_for_test.cc b/sync/api/attachments/attachment_service_proxy_for_test.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d076321c9418c52267a77e90444fab732512512f
--- /dev/null
+++ b/sync/api/attachments/attachment_service_proxy_for_test.cc
@@ -0,0 +1,49 @@
+// 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 "sync/api/attachments/attachment_service_proxy_for_test.h"
+
+#include "base/message_loop/message_loop_proxy.h"
+#include "sync/api/attachments/fake_attachment_service.h"
+
+namespace syncer {
+
+AttachmentServiceProxyForTest::OwningCore::OwningCore(
+    scoped_ptr<AttachmentService> wrapped,
+    scoped_ptr<base::WeakPtrFactory<AttachmentService> > weak_ptr_factory)
+    : ForwardingCore(weak_ptr_factory->GetWeakPtr()),
+      wrapped_(wrapped.Pass()),
+      weak_ptr_factory_(weak_ptr_factory.Pass()) {
+  DCHECK(wrapped_);
+}
+
+AttachmentServiceProxyForTest::OwningCore::~OwningCore() {}
+
+// Static.
+AttachmentServiceProxy AttachmentServiceProxyForTest::Create() {
+  scoped_ptr<AttachmentService> wrapped(FakeAttachmentService::CreateForTest());
+  // This class's base class, AttachmentServiceProxy, must be initialized with a
+  // WeakPtr to an AttachmentService.  Because the base class ctor must be
+  // invoked before any of this class's members are initialized, we create the
+  // WeakPtrFactory here and pass it to the ctor so that it may initialize its
+  // base class and own the WeakPtrFactory.
+  //
+  // We must pass by scoped_ptr because WeakPtrFactory has no copy constructor.
+  scoped_ptr<base::WeakPtrFactory<AttachmentService> > weak_ptr_factory(
+      new base::WeakPtrFactory<AttachmentService>(wrapped.get()));
+
+  scoped_refptr<ForwardingCore> core_for_test(
+      new OwningCore(wrapped.Pass(), weak_ptr_factory.Pass()));
+  return AttachmentServiceProxyForTest(base::MessageLoopProxy::current(),
+                                       core_for_test);
+}
+
+AttachmentServiceProxyForTest::~AttachmentServiceProxyForTest() {}
+
+AttachmentServiceProxyForTest::AttachmentServiceProxyForTest(
+    const scoped_refptr<base::SequencedTaskRunner>& wrapped_task_runner,
+    const scoped_refptr<ForwardingCore>& core)
+    : AttachmentServiceProxy(wrapped_task_runner, core) {}
+
+}  // namespace syncer