| Index: components/syncable_prefs/pref_service_syncable_unittest.cc
|
| diff --git a/components/syncable_prefs/pref_service_syncable_unittest.cc b/components/syncable_prefs/pref_service_syncable_unittest.cc
|
| index 2c90f9c8c291ca74f4bcb2b159acd53dc6e2ee6b..cc173d1cca9fe33f8ef2fbd79b7e76bbe006711c 100644
|
| --- a/components/syncable_prefs/pref_service_syncable_unittest.cc
|
| +++ b/components/syncable_prefs/pref_service_syncable_unittest.cc
|
| @@ -4,9 +4,12 @@
|
|
|
| #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"
|
| @@ -120,11 +123,10 @@ class PrefServiceSyncableTest : public testing::Test {
|
| 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))
|
|
|