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

sync/api/attachments/attachment_service_proxy_for_test.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 SYNC_API_ATTACHMENTS_ATTACHMENT_SERVICE_PROXY_FOR_TEST_H_
+#define SYNC_API_ATTACHMENTS_ATTACHMENT_SERVICE_PROXY_FOR_TEST_H_
+
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
+#include "sync/api/attachments/attachment_service_proxy.h"
+#include "sync/base/sync_export.h"
+
+namespace syncer {
+
+// Helper class to implement "base from member" idiom.
+//
+// Logically private to AttachmentServiceProxyForTest.
+class SYNC_EXPORT AttachmentServiceProxyForTestMember {
+ protected:
+  scoped_ptr<AttachmentService> wrapped_;
+  base::WeakPtrFactory<AttachmentService> wrapped_weak_ptr_factory_;
+  explicit AttachmentServiceProxyForTestMember(
+      scoped_ptr<AttachmentService> wrapped);
+  virtual ~AttachmentServiceProxyForTestMember();
+};
+
+// An AttachmentServiceProxy to reduce boilerplate code in tests.
+//
+// Constructs and owns an AttachmentService suitable for use in tests.  Assumes
+// the current thread has a MessageLoop.
+class SYNC_EXPORT AttachmentServiceProxyForTest
+    : private AttachmentServiceProxyForTestMember,
+      public AttachmentServiceProxy {
+ public:
+  // Default copy and assignment are welcome.
+  AttachmentServiceProxyForTest();
+  virtual ~AttachmentServiceProxyForTest();
+};
+
+}  // namespace syncer
+
+#endif  // SYNC_API_ATTACHMENTS_ATTACHMENT_SERVICE_PROXY_FOR_TEST_H_