| Index: components/printing/test/print_web_view_helper_browsertest.cc
|
| diff --git a/components/printing/test/print_web_view_helper_browsertest.cc b/components/printing/test/print_web_view_helper_browsertest.cc
|
| index 864adc63d475c2563dfcf3943a3d10d79e9658dc..21ebc5a399007bfc6b284868db376761db3a36bd 100644
|
| --- a/components/printing/test/print_web_view_helper_browsertest.cc
|
| +++ b/components/printing/test/print_web_view_helper_browsertest.cc
|
| @@ -172,7 +172,7 @@ class PrintWebViewHelperTestBase : public content::RenderViewTest {
|
| PrintHostMsg_DidGetPrintedPagesCount::Param post_page_count_param;
|
| PrintHostMsg_DidGetPrintedPagesCount::Read(page_cnt_msg,
|
| &post_page_count_param);
|
| - EXPECT_EQ(count, get<1>(post_page_count_param));
|
| + EXPECT_EQ(count, base::get<1>(post_page_count_param));
|
| #endif // defined(OS_CHROMEOS)
|
| }
|
|
|
| @@ -187,7 +187,7 @@ class PrintWebViewHelperTestBase : public content::RenderViewTest {
|
| PrintHostMsg_DidGetPreviewPageCount::Param post_page_count_param;
|
| PrintHostMsg_DidGetPreviewPageCount::Read(page_cnt_msg,
|
| &post_page_count_param);
|
| - EXPECT_EQ(count, get<0>(post_page_count_param).page_count);
|
| + EXPECT_EQ(count, base::get<0>(post_page_count_param).page_count);
|
| }
|
|
|
| // Verifies whether the pages printed or not.
|
| @@ -206,7 +206,7 @@ class PrintWebViewHelperTestBase : public content::RenderViewTest {
|
| if (printed) {
|
| PrintHostMsg_DidPrintPage::Param post_did_print_page_param;
|
| PrintHostMsg_DidPrintPage::Read(print_msg, &post_did_print_page_param);
|
| - EXPECT_EQ(0, get<0>(post_did_print_page_param).page_number);
|
| + EXPECT_EQ(0, base::get<0>(post_did_print_page_param).page_number);
|
| }
|
| #endif // defined(OS_CHROMEOS)
|
| }
|
| @@ -543,9 +543,9 @@ class MAYBE_PrintWebViewHelperPreviewTest : public PrintWebViewHelperTestBase {
|
| if (did_get_preview_msg) {
|
| PrintHostMsg_MetafileReadyForPrinting::Param preview_param;
|
| PrintHostMsg_MetafileReadyForPrinting::Read(preview_msg, &preview_param);
|
| - EXPECT_NE(0, get<0>(preview_param).document_cookie);
|
| - EXPECT_NE(0, get<0>(preview_param).expected_pages_count);
|
| - EXPECT_NE(0U, get<0>(preview_param).data_size);
|
| + EXPECT_NE(0, base::get<0>(preview_param).document_cookie);
|
| + EXPECT_NE(0, base::get<0>(preview_param).expected_pages_count);
|
| + EXPECT_NE(0U, base::get<0>(preview_param).data_size);
|
| }
|
| }
|
|
|
| @@ -571,12 +571,12 @@ class MAYBE_PrintWebViewHelperPreviewTest : public PrintWebViewHelperTestBase {
|
| if (msg->type() == PrintHostMsg_DidPreviewPage::ID) {
|
| PrintHostMsg_DidPreviewPage::Param page_param;
|
| PrintHostMsg_DidPreviewPage::Read(msg, &page_param);
|
| - if (get<0>(page_param).page_number == page_number) {
|
| + if (base::get<0>(page_param).page_number == page_number) {
|
| msg_found = true;
|
| if (generate_draft_pages)
|
| - EXPECT_NE(0U, get<0>(page_param).data_size);
|
| + EXPECT_NE(0U, base::get<0>(page_param).data_size);
|
| else
|
| - EXPECT_EQ(0U, get<0>(page_param).data_size);
|
| + EXPECT_EQ(0U, base::get<0>(page_param).data_size);
|
| break;
|
| }
|
| }
|
| @@ -599,13 +599,13 @@ class MAYBE_PrintWebViewHelperPreviewTest : public PrintWebViewHelperTestBase {
|
| PrintHostMsg_DidGetDefaultPageLayout::Param param;
|
| PrintHostMsg_DidGetDefaultPageLayout::Read(default_page_layout_msg,
|
| ¶m);
|
| - EXPECT_EQ(content_width, get<0>(param).content_width);
|
| - EXPECT_EQ(content_height, get<0>(param).content_height);
|
| - EXPECT_EQ(margin_top, get<0>(param).margin_top);
|
| - EXPECT_EQ(margin_right, get<0>(param).margin_right);
|
| - EXPECT_EQ(margin_left, get<0>(param).margin_left);
|
| - EXPECT_EQ(margin_bottom, get<0>(param).margin_bottom);
|
| - EXPECT_EQ(page_has_print_css, get<2>(param));
|
| + EXPECT_EQ(content_width, base::get<0>(param).content_width);
|
| + EXPECT_EQ(content_height, base::get<0>(param).content_height);
|
| + EXPECT_EQ(margin_top, base::get<0>(param).margin_top);
|
| + EXPECT_EQ(margin_right, base::get<0>(param).margin_right);
|
| + EXPECT_EQ(margin_left, base::get<0>(param).margin_left);
|
| + EXPECT_EQ(margin_bottom, base::get<0>(param).margin_bottom);
|
| + EXPECT_EQ(page_has_print_css, base::get<2>(param));
|
| }
|
| }
|
|
|
|
|