Switch to standard integer types in components/, part 4 of 4.

components/syncable_prefs/pref_service_syncable_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 "components/syncable_prefs/pref_service_syncable.h"
 
+#include <stdint.h>
+
 #include "base/json/json_reader.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/json/json_writer.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/syncable_prefs/pref_model_associator.h"
 #include "components/syncable_prefs/pref_model_associator_client.h"
 #include "components/syncable_prefs/testing_pref_service_syncable.h"
 #include "sync/api/attachments/attachment_id.h"
 #include "sync/api/sync_change.h"
 #include "sync/api/sync_data.h"
@@ skipping 93 matching lines @@
         kDefaultCharsetPrefName,
         kDefaultCharsetValue,
         user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 
     pref_sync_service_ = reinterpret_cast<PrefModelAssociator*>(
         prefs_.GetSyncableService(syncer::PREFERENCES));
     ASSERT_TRUE(pref_sync_service_);
     next_pref_remote_sync_node_id_ = 0;
   }
 
-  syncer::SyncChange MakeRemoteChange(
-      int64 id,
-      const std::string& name,
-      const base::Value& value,
-      SyncChange::SyncChangeType type) {
+  syncer::SyncChange MakeRemoteChange(int64_t id,
+                                      const std::string& name,
+                                      const base::Value& value,
+                                      SyncChange::SyncChangeType type) {
     std::string serialized;
     JSONStringValueSerializer json(&serialized);
     if (!json.Serialize(value))
       return syncer::SyncChange();
     sync_pb::EntitySpecifics entity;
     sync_pb::PreferenceSpecifics* pref_one = entity.mutable_preference();
     pref_one->set_name(name);
     pref_one->set_value(serialized);
     return syncer::SyncChange(
         FROM_HERE,
@@ skipping 413 matching lines @@
   syncer::SyncChangeList list;
   list.push_back(MakeRemoteChange(
       1, kStringPrefName, *null_value, SyncChange::ACTION_DELETE));
   pref_sync_service_->ProcessSyncChanges(FROM_HERE, list);
   EXPECT_TRUE(pref->IsDefaultValue());
 }
 
 }  // namespace
 
 }  // namespace syncable_prefs