| Index: chrome/browser/sync/engine/syncapi_unittest.cc
|
| diff --git a/chrome/browser/sync/engine/syncapi_unittest.cc b/chrome/browser/sync/engine/syncapi_unittest.cc
|
| index cc3fdba91dea33af9baccc19dd1dd06c451243b5..76803582e4d9ced901d3cc91e3d45b8127670f54 100644
|
| --- a/chrome/browser/sync/engine/syncapi_unittest.cc
|
| +++ b/chrome/browser/sync/engine/syncapi_unittest.cc
|
| @@ -918,7 +918,7 @@ TEST_F(SyncManagerTest, ProcessJsMessage) {
|
| StrictMock<MockJsReplyHandler> reply_handler;
|
|
|
| ListValue false_args;
|
| - false_args.Append(Value::CreateBooleanValue(false));
|
| + false_args.Append(base::FalseValue());
|
|
|
| EXPECT_CALL(reply_handler,
|
| HandleJsReply("getNotificationState",
|
| @@ -1005,7 +1005,7 @@ class SyncManagerGetNodesByIdTest : public SyncManagerTest {
|
| ListValue args;
|
| ListValue* id_values = new ListValue();
|
| args.Append(id_values);
|
| - id_values->Append(Value::CreateStringValue(base::Int64ToString(ids[i])));
|
| + id_values->Append(base::StringValue::New(base::Int64ToString(ids[i])));
|
| SendJsMessage(message_name,
|
| JsArgList(&args), reply_handler.AsWeakHandle());
|
|
|
| @@ -1042,7 +1042,7 @@ class SyncManagerGetNodesByIdTest : public SyncManagerTest {
|
| ListValue args;
|
| ListValue* ids = new ListValue();
|
| args.Append(ids);
|
| - ids->Append(Value::CreateStringValue(""));
|
| + ids->Append(base::StringValue::New(""));
|
| SendJsMessage(message_name,
|
| JsArgList(&args), reply_handler.AsWeakHandle());
|
| }
|
| @@ -1051,7 +1051,7 @@ class SyncManagerGetNodesByIdTest : public SyncManagerTest {
|
| ListValue args;
|
| ListValue* ids = new ListValue();
|
| args.Append(ids);
|
| - ids->Append(Value::CreateStringValue("nonsense"));
|
| + ids->Append(base::StringValue::New("nonsense"));
|
| SendJsMessage(message_name,
|
| JsArgList(&args), reply_handler.AsWeakHandle());
|
| }
|
| @@ -1060,7 +1060,7 @@ class SyncManagerGetNodesByIdTest : public SyncManagerTest {
|
| ListValue args;
|
| ListValue* ids = new ListValue();
|
| args.Append(ids);
|
| - ids->Append(Value::CreateStringValue("0"));
|
| + ids->Append(base::StringValue::New("0"));
|
| SendJsMessage(message_name,
|
| JsArgList(&args), reply_handler.AsWeakHandle());
|
| }
|
| @@ -1069,7 +1069,7 @@ class SyncManagerGetNodesByIdTest : public SyncManagerTest {
|
| ListValue args;
|
| ListValue* ids = new ListValue();
|
| args.Append(ids);
|
| - ids->Append(Value::CreateStringValue("9999"));
|
| + ids->Append(base::StringValue::New("9999"));
|
| SendJsMessage(message_name,
|
| JsArgList(&args), reply_handler.AsWeakHandle());
|
| }
|
| @@ -1103,7 +1103,7 @@ TEST_F(SyncManagerTest, GetChildNodeIds) {
|
|
|
| {
|
| ListValue args;
|
| - args.Append(Value::CreateStringValue("1"));
|
| + args.Append(base::StringValue::New("1"));
|
| SendJsMessage("getChildNodeIds",
|
| JsArgList(&args), reply_handler.AsWeakHandle());
|
| }
|
| @@ -1134,28 +1134,28 @@ TEST_F(SyncManagerTest, GetChildNodeIdsFailure) {
|
|
|
| {
|
| ListValue args;
|
| - args.Append(Value::CreateStringValue(""));
|
| + args.Append(base::StringValue::New(""));
|
| SendJsMessage("getChildNodeIds",
|
| JsArgList(&args), reply_handler.AsWeakHandle());
|
| }
|
|
|
| {
|
| ListValue args;
|
| - args.Append(Value::CreateStringValue("nonsense"));
|
| + args.Append(base::StringValue::New("nonsense"));
|
| SendJsMessage("getChildNodeIds",
|
| JsArgList(&args), reply_handler.AsWeakHandle());
|
| }
|
|
|
| {
|
| ListValue args;
|
| - args.Append(Value::CreateStringValue("0"));
|
| + args.Append(base::StringValue::New("0"));
|
| SendJsMessage("getChildNodeIds",
|
| JsArgList(&args), reply_handler.AsWeakHandle());
|
| }
|
|
|
| {
|
| ListValue args;
|
| - args.Append(Value::CreateStringValue("9999"));
|
| + args.Append(base::StringValue::New("9999"));
|
| SendJsMessage("getChildNodeIds",
|
| JsArgList(&args), reply_handler.AsWeakHandle());
|
| }
|
| @@ -1212,7 +1212,7 @@ TEST_F(SyncManagerTest, OnIncomingNotification) {
|
| i < syncable::MODEL_TYPE_COUNT; ++i) {
|
| if (model_types[i]) {
|
| model_type_list->Append(
|
| - Value::CreateStringValue(
|
| + base::StringValue::New(
|
| syncable::ModelTypeToString(
|
| syncable::ModelTypeFromInt(i))));
|
| }
|
|
|