| Index: content/browser/webui/web_ui_message_handler_unittest.cc
|
| ===================================================================
|
| --- content/browser/webui/web_ui_message_handler_unittest.cc (revision 181443)
|
| +++ content/browser/webui/web_ui_message_handler_unittest.cc (working copy)
|
| @@ -18,78 +18,78 @@
|
| string16 neg_string(UTF8ToUTF16("-1234"));
|
| string16 pos_string(UTF8ToUTF16("1234"));
|
|
|
| - list.Append(Value::CreateIntegerValue(zero_value));
|
| + list.Append(new base::FundamentalValue(zero_value));
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractIntegerValue(&list, &value));
|
| EXPECT_EQ(value, zero_value);
|
| list.Clear();
|
|
|
| - list.Append(Value::CreateIntegerValue(neg_value));
|
| + list.Append(new base::FundamentalValue(neg_value));
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractIntegerValue(&list, &value));
|
| EXPECT_EQ(value, neg_value);
|
| list.Clear();
|
|
|
| - list.Append(Value::CreateIntegerValue(pos_value));
|
| + list.Append(new base::FundamentalValue(pos_value));
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractIntegerValue(&list, &value));
|
| EXPECT_EQ(value, pos_value);
|
| list.Clear();
|
|
|
| - list.Append(Value::CreateStringValue(zero_string));
|
| + list.Append(new base::StringValue(zero_string));
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractIntegerValue(&list, &value));
|
| EXPECT_EQ(value, zero_value);
|
| list.Clear();
|
|
|
| - list.Append(Value::CreateStringValue(neg_string));
|
| + list.Append(new base::StringValue(neg_string));
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractIntegerValue(&list, &value));
|
| EXPECT_EQ(value, neg_value);
|
| list.Clear();
|
|
|
| - list.Append(Value::CreateStringValue(pos_string));
|
| + list.Append(new base::StringValue(pos_string));
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractIntegerValue(&list, &value));
|
| EXPECT_EQ(value, pos_value);
|
| }
|
|
|
| TEST(WebUIMessageHandlerTest, ExtractDoubleValue) {
|
| - ListValue list;
|
| + base::ListValue list;
|
| double value, zero_value = 0.0, neg_value = -1234.5, pos_value = 1234.5;
|
| string16 zero_string(UTF8ToUTF16("0"));
|
| string16 neg_string(UTF8ToUTF16("-1234.5"));
|
| string16 pos_string(UTF8ToUTF16("1234.5"));
|
|
|
| - list.Append(Value::CreateDoubleValue(zero_value));
|
| + list.Append(new base::FundamentalValue(zero_value));
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value));
|
| EXPECT_DOUBLE_EQ(value, zero_value);
|
| list.Clear();
|
|
|
| - list.Append(Value::CreateDoubleValue(neg_value));
|
| + list.Append(new base::FundamentalValue(neg_value));
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value));
|
| EXPECT_DOUBLE_EQ(value, neg_value);
|
| list.Clear();
|
|
|
| - list.Append(Value::CreateDoubleValue(pos_value));
|
| + list.Append(new base::FundamentalValue(pos_value));
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value));
|
| EXPECT_DOUBLE_EQ(value, pos_value);
|
| list.Clear();
|
|
|
| - list.Append(Value::CreateStringValue(zero_string));
|
| + list.Append(new base::StringValue(zero_string));
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value));
|
| EXPECT_DOUBLE_EQ(value, zero_value);
|
| list.Clear();
|
|
|
| - list.Append(Value::CreateStringValue(neg_string));
|
| + list.Append(new base::StringValue(neg_string));
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value));
|
| EXPECT_DOUBLE_EQ(value, neg_value);
|
| list.Clear();
|
|
|
| - list.Append(Value::CreateStringValue(pos_string));
|
| + list.Append(new base::StringValue(pos_string));
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value));
|
| EXPECT_DOUBLE_EQ(value, pos_value);
|
| }
|
|
|
| TEST(WebUIMessageHandlerTest, ExtractStringValue) {
|
| - ListValue list;
|
| + base::ListValue list;
|
| string16 in_string(UTF8ToUTF16(
|
| "The facts, though interesting, are irrelevant."));
|
| - list.Append(Value::CreateStringValue(in_string));
|
| + list.Append(new base::StringValue(in_string));
|
| string16 out_string = WebUIMessageHandler::ExtractStringValue(&list);
|
| EXPECT_EQ(in_string, out_string);
|
| }
|
|
|