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

sync/api/sync_data_unittest.cc

 // 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/sync_data.h"
 
 #include <string>
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 16 matching lines @@
 const ModelType kDatatype = syncer::PREFERENCES;
 const string kNonUniqueTitle = "my preference";
 const int64 kId = 439829;
 const base::Time kLastModifiedTime = base::Time();
 
 class SyncDataTest : public testing::Test {
  protected:
   SyncDataTest()
       : attachment_service(FakeAttachmentService::CreateForTest()),
         attachment_service_weak_ptr_factory(attachment_service.get()),
-        attachment_service_proxy(
+        attachment_service_proxy(new AttachmentServiceProxy(
             base::MessageLoopProxy::current(),
-            attachment_service_weak_ptr_factory.GetWeakPtr()) {}
+            attachment_service_weak_ptr_factory.GetWeakPtr())) {}
   base::MessageLoop loop;
   sync_pb::EntitySpecifics specifics;
   scoped_ptr<AttachmentService> attachment_service;
   base::WeakPtrFactory<AttachmentService> attachment_service_weak_ptr_factory;
-  AttachmentServiceProxy attachment_service_proxy;
+  scoped_refptr<AttachmentServiceProxy> attachment_service_proxy;
 };
 
 TEST_F(SyncDataTest, NoArgCtor) {
   SyncData data;
   EXPECT_FALSE(data.IsValid());
 }
 
 TEST_F(SyncDataTest, CreateLocalDelete) {
   SyncData data = SyncData::CreateLocalDelete(kSyncTag, kDatatype);
   EXPECT_TRUE(data.IsValid());
@@ skipping 58 matching lines @@
                                              AttachmentIdList(),
                                              attachment_service_proxy);
   EXPECT_TRUE(data.IsValid());
   EXPECT_FALSE(data.IsLocal());
   EXPECT_EQ(kId, SyncDataRemote(data).GetId());
   EXPECT_EQ(kLastModifiedTime, SyncDataRemote(data).GetModifiedTime());
   EXPECT_TRUE(data.GetSpecifics().has_preference());
   EXPECT_TRUE(data.GetAttachmentIds().empty());
 }
 
-TEST_F(SyncDataTest, CreateRemoteData_WithoutAttachmentService) {
-  specifics.mutable_preference();
-  SyncData data = SyncData::CreateRemoteData(kId, specifics, kLastModifiedTime);
-  EXPECT_TRUE(data.IsValid());
-  EXPECT_FALSE(data.IsLocal());
-  EXPECT_EQ(kId, SyncDataRemote(data).GetId());
-  EXPECT_EQ(kLastModifiedTime, SyncDataRemote(data).GetModifiedTime());
-  EXPECT_TRUE(data.GetSpecifics().has_preference());
-}
-
 // TODO(maniscalco): Add test cases that verify GetLocalAttachmentsForUpload and
 // DropAttachments calls are passed through to the underlying AttachmentService.
 
 }  // namespace
 
 }  // namespace syncer