| 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 fe09a7be5e663011e0d6d67074b905f5fac70ddd..cd12a3e8d61004129cfc0a6375c81dc590e4b9f2 100644
|
| --- a/content/browser/webui/web_ui_message_handler_unittest.cc
|
| +++ b/content/browser/webui/web_ui_message_handler_unittest.cc
|
| @@ -14,9 +14,9 @@ namespace content {
|
| TEST(WebUIMessageHandlerTest, ExtractIntegerValue) {
|
| base::ListValue list;
|
| int value, zero_value = 0, neg_value = -1234, pos_value = 1234;
|
| - base::string16 zero_string(UTF8ToUTF16("0"));
|
| - base::string16 neg_string(UTF8ToUTF16("-1234"));
|
| - base::string16 pos_string(UTF8ToUTF16("1234"));
|
| + base::string16 zero_string(base::UTF8ToUTF16("0"));
|
| + base::string16 neg_string(base::UTF8ToUTF16("-1234"));
|
| + base::string16 pos_string(base::UTF8ToUTF16("1234"));
|
|
|
| list.Append(new base::FundamentalValue(zero_value));
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractIntegerValue(&list, &value));
|
| @@ -51,9 +51,9 @@ TEST(WebUIMessageHandlerTest, ExtractIntegerValue) {
|
| TEST(WebUIMessageHandlerTest, ExtractDoubleValue) {
|
| base::ListValue list;
|
| double value, zero_value = 0.0, neg_value = -1234.5, pos_value = 1234.5;
|
| - base::string16 zero_string(UTF8ToUTF16("0"));
|
| - base::string16 neg_string(UTF8ToUTF16("-1234.5"));
|
| - base::string16 pos_string(UTF8ToUTF16("1234.5"));
|
| + base::string16 zero_string(base::UTF8ToUTF16("0"));
|
| + base::string16 neg_string(base::UTF8ToUTF16("-1234.5"));
|
| + base::string16 pos_string(base::UTF8ToUTF16("1234.5"));
|
|
|
| list.Append(new base::FundamentalValue(zero_value));
|
| EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value));
|
| @@ -87,7 +87,7 @@ TEST(WebUIMessageHandlerTest, ExtractDoubleValue) {
|
|
|
| TEST(WebUIMessageHandlerTest, ExtractStringValue) {
|
| base::ListValue list;
|
| - base::string16 in_string(UTF8ToUTF16(
|
| + base::string16 in_string(base::UTF8ToUTF16(
|
| "The facts, though interesting, are irrelevant."));
|
| list.Append(new base::StringValue(in_string));
|
| base::string16 out_string = WebUIMessageHandler::ExtractStringValue(&list);
|
|
|