| Index: content/browser/webui/web_ui_message_handler_unittest.cc
|
| diff --git a/content/browser/webui/web_ui_message_handler_unittest.cc b/content/browser/webui/web_ui_message_handler_unittest.cc
|
| index cd12a3e8d61004129cfc0a6375c81dc590e4b9f2..46a0829ea35e3738806189852933dda82da35547 100644
|
| --- a/content/browser/webui/web_ui_message_handler_unittest.cc
|
| +++ b/content/browser/webui/web_ui_message_handler_unittest.cc
|
| @@ -18,32 +18,32 @@ TEST(WebUIMessageHandlerTest, ExtractIntegerValue) {
|
| base::string16 neg_string(base::UTF8ToUTF16("-1234"));
|
| base::string16 pos_string(base::UTF8ToUTF16("1234"));
|
|
|
| - list.Append(new base::FundamentalValue(zero_value));
|
| + list.AppendInteger(zero_value);
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractIntegerValue(&list, &value));
|
| EXPECT_EQ(value, zero_value);
|
| list.Clear();
|
|
|
| - list.Append(new base::FundamentalValue(neg_value));
|
| + list.AppendInteger(neg_value);
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractIntegerValue(&list, &value));
|
| EXPECT_EQ(value, neg_value);
|
| list.Clear();
|
|
|
| - list.Append(new base::FundamentalValue(pos_value));
|
| + list.AppendInteger(pos_value);
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractIntegerValue(&list, &value));
|
| EXPECT_EQ(value, pos_value);
|
| list.Clear();
|
|
|
| - list.Append(new base::StringValue(zero_string));
|
| + list.AppendString(zero_string);
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractIntegerValue(&list, &value));
|
| EXPECT_EQ(value, zero_value);
|
| list.Clear();
|
|
|
| - list.Append(new base::StringValue(neg_string));
|
| + list.AppendString(neg_string);
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractIntegerValue(&list, &value));
|
| EXPECT_EQ(value, neg_value);
|
| list.Clear();
|
|
|
| - list.Append(new base::StringValue(pos_string));
|
| + list.AppendString(pos_string);
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractIntegerValue(&list, &value));
|
| EXPECT_EQ(value, pos_value);
|
| }
|
| @@ -55,32 +55,32 @@ TEST(WebUIMessageHandlerTest, ExtractDoubleValue) {
|
| base::string16 neg_string(base::UTF8ToUTF16("-1234.5"));
|
| base::string16 pos_string(base::UTF8ToUTF16("1234.5"));
|
|
|
| - list.Append(new base::FundamentalValue(zero_value));
|
| + list.AppendDouble(zero_value);
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value));
|
| EXPECT_DOUBLE_EQ(value, zero_value);
|
| list.Clear();
|
|
|
| - list.Append(new base::FundamentalValue(neg_value));
|
| + list.AppendDouble(neg_value);
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value));
|
| EXPECT_DOUBLE_EQ(value, neg_value);
|
| list.Clear();
|
|
|
| - list.Append(new base::FundamentalValue(pos_value));
|
| + list.AppendDouble(pos_value);
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value));
|
| EXPECT_DOUBLE_EQ(value, pos_value);
|
| list.Clear();
|
|
|
| - list.Append(new base::StringValue(zero_string));
|
| + list.AppendString(zero_string);
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value));
|
| EXPECT_DOUBLE_EQ(value, zero_value);
|
| list.Clear();
|
|
|
| - list.Append(new base::StringValue(neg_string));
|
| + list.AppendString(neg_string);
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value));
|
| EXPECT_DOUBLE_EQ(value, neg_value);
|
| list.Clear();
|
|
|
| - list.Append(new base::StringValue(pos_string));
|
| + list.AppendString(pos_string);
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value));
|
| EXPECT_DOUBLE_EQ(value, pos_value);
|
| }
|
| @@ -89,7 +89,7 @@ TEST(WebUIMessageHandlerTest, ExtractStringValue) {
|
| base::ListValue list;
|
| base::string16 in_string(base::UTF8ToUTF16(
|
| "The facts, though interesting, are irrelevant."));
|
| - list.Append(new base::StringValue(in_string));
|
| + list.AppendString(in_string);
|
| base::string16 out_string = WebUIMessageHandler::ExtractStringValue(&list);
|
| EXPECT_EQ(in_string, out_string);
|
| }
|
|
|