summaryrefslogtreecommitdiffstats
path: root/sync/js
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-16 04:30:42 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-16 04:30:42 +0000
commit9be7a32aa4714bcd216fba8256f1e914443ad663 (patch)
tree271dc3c64602f7b1ca4255dfa2caac5f9c40e355 /sync/js
parentb0101d770f09d722dab872dd5dce34a6e631c5ed (diff)
downloadchromium_src-9be7a32aa4714bcd216fba8256f1e914443ad663.zip
chromium_src-9be7a32aa4714bcd216fba8256f1e914443ad663.tar.gz
chromium_src-9be7a32aa4714bcd216fba8256f1e914443ad663.tar.bz2
Cleanup: Remove deprecated base::Value methods from sync. Use base::Value too.
Review URL: https://chromiumcodereview.appspot.com/12262057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182922 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/js')
-rw-r--r--sync/js/js_arg_list_unittest.cc12
-rw-r--r--sync/js/sync_js_controller_unittest.cc14
2 files changed, 13 insertions, 13 deletions
diff --git a/sync/js/js_arg_list_unittest.cc b/sync/js/js_arg_list_unittest.cc
index 537012d..2a10286 100644
--- a/sync/js/js_arg_list_unittest.cc
+++ b/sync/js/js_arg_list_unittest.cc
@@ -19,15 +19,15 @@ TEST_F(JsArgListTest, EmptyList) {
}
TEST_F(JsArgListTest, FromList) {
- scoped_ptr<ListValue> list(new ListValue());
- list->Append(Value::CreateBooleanValue(false));
- list->Append(Value::CreateIntegerValue(5));
- DictionaryValue* dict = new DictionaryValue();
+ scoped_ptr<base::ListValue> list(new base::ListValue());
+ list->Append(new base::FundamentalValue(false));
+ list->Append(new base::FundamentalValue(5));
+ base::DictionaryValue* dict = new base::DictionaryValue();
list->Append(dict);
dict->SetString("foo", "bar");
- dict->Set("baz", new ListValue());
+ dict->Set("baz", new base::ListValue());
- scoped_ptr<ListValue> list_copy(list->DeepCopy());
+ scoped_ptr<base::ListValue> list_copy(list->DeepCopy());
JsArgList arg_list(list.get());
diff --git a/sync/js/sync_js_controller_unittest.cc b/sync/js/sync_js_controller_unittest.cc
index ad7973e..9a201f2 100644
--- a/sync/js/sync_js_controller_unittest.cc
+++ b/sync/js/sync_js_controller_unittest.cc
@@ -36,9 +36,9 @@ TEST_F(SyncJsControllerTest, Messages) {
StrictMock<MockJsBackend> mock_backend;
SyncJsController sync_js_controller;
- ListValue arg_list1, arg_list2;
- arg_list1.Append(Value::CreateBooleanValue(false));
- arg_list2.Append(Value::CreateIntegerValue(5));
+ base::ListValue arg_list1, arg_list2;
+ arg_list1.Append(new base::FundamentalValue(false));
+ arg_list2.Append(new base::FundamentalValue(5));
JsArgList args1(&arg_list1), args2(&arg_list2);
// TODO(akalin): Write matchers for WeakHandle and use them here
@@ -62,9 +62,9 @@ TEST_F(SyncJsControllerTest, QueuedMessages) {
StrictMock<MockJsBackend> mock_backend;
SyncJsController sync_js_controller;
- ListValue arg_list1, arg_list2;
- arg_list1.Append(Value::CreateBooleanValue(false));
- arg_list2.Append(Value::CreateIntegerValue(5));
+ base::ListValue arg_list1, arg_list2;
+ arg_list1.Append(new base::FundamentalValue(false));
+ arg_list2.Append(new base::FundamentalValue(5));
JsArgList args1(&arg_list1), args2(&arg_list2);
// Should queue messages.
@@ -98,7 +98,7 @@ TEST_F(SyncJsControllerTest, Events) {
InSequence dummy;
SyncJsController sync_js_controller;
- DictionaryValue details_dict1, details_dict2;
+ base::DictionaryValue details_dict1, details_dict2;
details_dict1.SetString("foo", "bar");
details_dict2.SetInteger("baz", 5);
JsEventDetails details1(&details_dict1), details2(&details_dict2);