summaryrefslogtreecommitdiffstats
path: root/content/browser/webui/web_ui_message_handler_unittest.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-03 20:11:26 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-03 20:11:26 +0000
commitfcf75d4016c7a2dcad1d2415009eff1e0eef4468 (patch)
treed41b14e6526a822b66d692f60dc8f648a2afb3cd /content/browser/webui/web_ui_message_handler_unittest.cc
parent426d1c945bcb1a8479d92a7dd023c34cbbc7a261 (diff)
downloadchromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.zip
chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.tar.gz
chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.tar.bz2
Convert string16 to base::string16 in content.
BUG= Review URL: https://codereview.chromium.org/102593002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/webui/web_ui_message_handler_unittest.cc')
-rw-r--r--content/browser/webui/web_ui_message_handler_unittest.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/content/browser/webui/web_ui_message_handler_unittest.cc b/content/browser/webui/web_ui_message_handler_unittest.cc
index e38acd7..33cdb61 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) {
ListValue list;
int value, zero_value = 0, neg_value = -1234, pos_value = 1234;
- string16 zero_string(UTF8ToUTF16("0"));
- string16 neg_string(UTF8ToUTF16("-1234"));
- string16 pos_string(UTF8ToUTF16("1234"));
+ base::string16 zero_string(UTF8ToUTF16("0"));
+ base::string16 neg_string(UTF8ToUTF16("-1234"));
+ base::string16 pos_string(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;
- string16 zero_string(UTF8ToUTF16("0"));
- string16 neg_string(UTF8ToUTF16("-1234.5"));
- string16 pos_string(UTF8ToUTF16("1234.5"));
+ base::string16 zero_string(UTF8ToUTF16("0"));
+ base::string16 neg_string(UTF8ToUTF16("-1234.5"));
+ base::string16 pos_string(UTF8ToUTF16("1234.5"));
list.Append(new base::FundamentalValue(zero_value));
EXPECT_TRUE(WebUIMessageHandler::ExtractDoubleValue(&list, &value));
@@ -87,10 +87,10 @@ TEST(WebUIMessageHandlerTest, ExtractDoubleValue) {
TEST(WebUIMessageHandlerTest, ExtractStringValue) {
base::ListValue list;
- string16 in_string(UTF8ToUTF16(
+ base::string16 in_string(UTF8ToUTF16(
"The facts, though interesting, are irrelevant."));
list.Append(new base::StringValue(in_string));
- string16 out_string = WebUIMessageHandler::ExtractStringValue(&list);
+ base::string16 out_string = WebUIMessageHandler::ExtractStringValue(&list);
EXPECT_EQ(in_string, out_string);
}