Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1479)

Unified Diff: content/browser/webui/web_ui_message_handler_unittest.cc

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 e38acd7e311d644e56dfce2c2bffaa0cdd715223..33cdb61fb11fa421698190ca4dd2c3a5c362af3c 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);
}
« no previous file with comments | « content/browser/webui/web_ui_message_handler.cc ('k') | content/browser/worker_host/test/worker_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698