Commit 7524342b authored by Lei Zhang's avatar Lei Zhang Committed by Commit Bot

Update base::Value API usage in PrintPreviewHandlerTest.

Change-Id: I3118c919f190e48de8399ac72c0f610f4bc2525d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1839016
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: default avatarRebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#702744}
parent ef9838ec
...@@ -672,7 +672,7 @@ TEST_F(PrintPreviewHandlerTest, GetPreview) { ...@@ -672,7 +672,7 @@ TEST_F(PrintPreviewHandlerTest, GetPreview) {
preview_id_found = true; preview_id_found = true;
continue; continue;
} }
base::Value* value_in = print_ticket.FindKey(it.first); const base::Value* value_in = print_ticket.FindKey(it.first);
ASSERT_TRUE(value_in); ASSERT_TRUE(value_in);
EXPECT_EQ(*value_in, it.second); EXPECT_EQ(*value_in, it.second);
} }
...@@ -690,30 +690,30 @@ TEST_F(PrintPreviewHandlerTest, SendPreviewUpdates) { ...@@ -690,30 +690,30 @@ TEST_F(PrintPreviewHandlerTest, SendPreviewUpdates) {
base::DictionaryValue preview_params = VerifyPreviewMessage(); base::DictionaryValue preview_params = VerifyPreviewMessage();
// Read the preview UI ID and request ID // Read the preview UI ID and request ID
const base::Value* request_value = preview_params.FindKey(kPreviewRequestID); base::Optional<int> request_value =
ASSERT_TRUE(request_value); preview_params.FindIntKey(kPreviewRequestID);
ASSERT_TRUE(request_value->is_int()); ASSERT_TRUE(request_value.has_value());
int preview_request_id = request_value->GetInt(); int preview_request_id = request_value.value();
const base::Value* ui_value = preview_params.FindKey(kPreviewUIID); base::Optional<int> ui_value = preview_params.FindIntKey(kPreviewUIID);
ASSERT_TRUE(ui_value); ASSERT_TRUE(ui_value.has_value());
ASSERT_TRUE(ui_value->is_int()); int preview_ui_id = ui_value.value();
int preview_ui_id = ui_value->GetInt();
// Simulate renderer responses: PageLayoutReady, PageCountReady, // Simulate renderer responses: PageLayoutReady, PageCountReady,
// PagePreviewReady, and OnPrintPreviewReady will be called in that order. // PagePreviewReady, and OnPrintPreviewReady will be called in that order.
base::DictionaryValue layout; base::DictionaryValue layout;
layout.SetKey(kSettingMarginTop, base::Value(34.0)); layout.SetDoubleKey(kSettingMarginTop, 34.0);
layout.SetKey(kSettingMarginLeft, base::Value(34.0)); layout.SetDoubleKey(kSettingMarginLeft, 34.0);
layout.SetKey(kSettingMarginBottom, base::Value(34.0)); layout.SetDoubleKey(kSettingMarginBottom, 34.0);
layout.SetKey(kSettingMarginRight, base::Value(34.0)); layout.SetDoubleKey(kSettingMarginRight, 34.0);
layout.SetKey(kSettingContentWidth, base::Value(544.0)); layout.SetDoubleKey(kSettingContentWidth, 544.0);
layout.SetKey(kSettingContentHeight, base::Value(700.0)); layout.SetDoubleKey(kSettingContentHeight, 700.0);
layout.SetKey(kSettingPrintableAreaX, base::Value(17)); layout.SetIntKey(kSettingPrintableAreaX, 17);
layout.SetKey(kSettingPrintableAreaY, base::Value(17)); layout.SetIntKey(kSettingPrintableAreaY, 17);
layout.SetKey(kSettingPrintableAreaWidth, base::Value(578)); layout.SetIntKey(kSettingPrintableAreaWidth, 578);
layout.SetKey(kSettingPrintableAreaHeight, base::Value(734)); layout.SetIntKey(kSettingPrintableAreaHeight, 734);
handler()->SendPageLayoutReady(layout, false, preview_request_id); handler()->SendPageLayoutReady(layout, /*has_custom_page_size_style,=*/false,
preview_request_id);
// Verify that page-layout-ready webUI event was fired. // Verify that page-layout-ready webUI event was fired.
AssertWebUIEventFired(*web_ui()->call_data().back(), "page-layout-ready"); AssertWebUIEventFired(*web_ui()->call_data().back(), "page-layout-ready");
...@@ -736,7 +736,8 @@ TEST_F(PrintPreviewHandlerTest, SendPreviewUpdates) { ...@@ -736,7 +736,8 @@ TEST_F(PrintPreviewHandlerTest, SendPreviewUpdates) {
// None of these should work since there has been no new preview request. // None of these should work since there has been no new preview request.
// Check that there are no new web UI messages sent. // Check that there are no new web UI messages sent.
size_t message_count = web_ui()->call_data().size(); size_t message_count = web_ui()->call_data().size();
handler()->SendPageLayoutReady(base::DictionaryValue(), false, handler()->SendPageLayoutReady(base::DictionaryValue(),
/*has_custom_page_size_style,=*/false,
preview_request_id); preview_request_id);
EXPECT_EQ(message_count, web_ui()->call_data().size()); EXPECT_EQ(message_count, web_ui()->call_data().size());
handler()->SendPageCountReady(1, -1, 0); handler()->SendPageCountReady(1, -1, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment