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

chrome/browser/managed_mode/managed_user_sync_service_unittest.cc

 // Copyright 2013 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 <string>
 
 #include "base/bind.h"
+#include "base/message_loop/message_loop.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/managed_mode/managed_user_sync_service.h"
 #include "chrome/browser/managed_mode/managed_user_sync_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
+#include "sync/api/attachments/attachment_id.h"
+#include "sync/api/attachments/attachment_service_proxy_for_test.h"
 #include "sync/api/sync_change.h"
 #include "sync/api/sync_error_factory_mock.h"
 #include "sync/protocol/sync.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/default_user_images.h"
 #endif
 
 using sync_pb::ManagedUserSpecifics;
@@ skipping 65 matching lines @@
   scoped_ptr<SyncErrorFactory> CreateErrorFactory();
   SyncData CreateRemoteData(const std::string& id,
                             const std::string& name,
                             const std::string& avatar);
 
   PrefService* prefs() { return profile_.GetPrefs(); }
   ManagedUserSyncService* service() { return service_; }
   MockChangeProcessor* change_processor() { return change_processor_; }
 
  private:
+  base::MessageLoop message_loop;
   TestingProfile profile_;
   ManagedUserSyncService* service_;
 
   // Owned by the ManagedUserSyncService.
   MockChangeProcessor* change_processor_;
 
   // A unique ID for creating "remote" Sync data.
   int64 sync_data_id_;
 };
 
@@ skipping 21 matching lines @@
     const std::string& id,
     const std::string& name,
     const std::string& chrome_avatar) {
   ::sync_pb::EntitySpecifics specifics;
   specifics.mutable_managed_user()->set_id(id);
   specifics.mutable_managed_user()->set_name(name);
   specifics.mutable_managed_user()->set_acknowledged(true);
   if (!chrome_avatar.empty())
     specifics.mutable_managed_user()->set_chrome_avatar(chrome_avatar);
 
-  return SyncData::CreateRemoteData(++sync_data_id_, specifics, base::Time());
+  return SyncData::CreateRemoteData(
+      ++sync_data_id_,
+      specifics,
+      base::Time(),
+      syncer::AttachmentIdList(),
+      syncer::AttachmentServiceProxyForTest::Create());
 }
 
 TEST_F(ManagedUserSyncServiceTest, MergeEmpty) {
   SyncMergeResult result =
       service()->MergeDataAndStartSyncing(MANAGED_USERS,
                                           SyncDataList(),
                                           CreateChangeProcessor(),
                                           CreateErrorFactory());
   EXPECT_FALSE(result.error().IsSet());
   EXPECT_EQ(0, result.num_items_added());
@@ skipping 188 matching lines @@
   EXPECT_FALSE(ManagedUserSyncService::GetAvatarIndex("chrome-avatar-index:",
                                                       &avatar));
 
   EXPECT_FALSE(ManagedUserSyncService::GetAvatarIndex("chrome-avatar-index:x",
                                                       &avatar));
 
   EXPECT_FALSE(ManagedUserSyncService::GetAvatarIndex("chromeos-avatar-index:5",
                                                       &avatar));
 #endif
 }