diff options
author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 22:28:01 +0000 |
---|---|---|
committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-12 22:28:01 +0000 |
commit | 0cd50aa38b761f0b4959794664698f19eeeffb23 (patch) | |
tree | b147a1f64956b452813295a793f4ad10ec40f7ea /content/browser/webui | |
parent | 292393b6a5bb764ef9e9bdb8f08e6045664358f4 (diff) | |
download | chromium_src-0cd50aa38b761f0b4959794664698f19eeeffb23.zip chromium_src-0cd50aa38b761f0b4959794664698f19eeeffb23.tar.gz chromium_src-0cd50aa38b761f0b4959794664698f19eeeffb23.tar.bz2 |
Cleanup: Remove deprecated base::Value methods from contents. Use base::Value too.
Review URL: https://chromiumcodereview.appspot.com/12207089
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182042 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/webui')
-rw-r--r-- | content/browser/webui/web_ui_message_handler_unittest.cc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/content/browser/webui/web_ui_message_handler_unittest.cc b/content/browser/webui/web_ui_message_handler_unittest.cc index 9b98211..496bcdb 100644 --- a/content/browser/webui/web_ui_message_handler_unittest.cc +++ b/content/browser/webui/web_ui_message_handler_unittest.cc @@ -18,78 +18,78 @@ TEST(WebUIMessageHandlerTest, ExtractIntegerValue) { 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); } |