| Index: chrome/renderer/print_web_view_helper_browsertest.cc
|
| diff --git a/chrome/renderer/print_web_view_helper_browsertest.cc b/chrome/renderer/print_web_view_helper_browsertest.cc
|
| index 3c362cf1c15cd04fde4141848eae3a2350899add..9f0a9ac5aadd72d1f845dad956b06ae59a89bcec 100644
|
| --- a/chrome/renderer/print_web_view_helper_browsertest.cc
|
| +++ b/chrome/renderer/print_web_view_helper_browsertest.cc
|
| @@ -5,7 +5,7 @@
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/print_messages.h"
|
| #include "chrome/renderer/print_web_view_helper.h"
|
| -#include "chrome/test/base/render_view_test.h"
|
| +#include "chrome/test/base/chrome_render_view_test.h"
|
| #include "content/public/renderer/render_view.h"
|
| #include "printing/print_job_constants.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -56,7 +56,7 @@ void CreatePrintSettingsDictionary(DictionaryValue* dict) {
|
|
|
| } // namespace
|
|
|
| -class PrintWebViewHelperTestBase : public RenderViewTest {
|
| +class PrintWebViewHelperTestBase : public ChromeRenderViewTest {
|
| public:
|
| PrintWebViewHelperTestBase() {}
|
| ~PrintWebViewHelperTestBase() {}
|
| @@ -72,7 +72,7 @@ class PrintWebViewHelperTestBase : public RenderViewTest {
|
| // the print code.
|
| #else
|
| const IPC::Message* page_cnt_msg =
|
| - render_thread_.sink().GetUniqueMessageMatching(
|
| + render_thread_->sink().GetUniqueMessageMatching(
|
| PrintHostMsg_DidGetPrintedPagesCount::ID);
|
| ASSERT_TRUE(page_cnt_msg);
|
| PrintHostMsg_DidGetPrintedPagesCount::Param post_page_count_param;
|
| @@ -85,12 +85,12 @@ class PrintWebViewHelperTestBase : public RenderViewTest {
|
| // Verifies whether the pages printed or not.
|
| void VerifyPagesPrinted(bool printed) {
|
| #if defined(OS_CHROMEOS)
|
| - bool did_print_msg = (render_thread_.sink().GetUniqueMessageMatching(
|
| + bool did_print_msg = (render_thread_->sink().GetUniqueMessageMatching(
|
| PrintHostMsg_TempFileForPrintingWritten::ID) != NULL);
|
| ASSERT_EQ(printed, did_print_msg);
|
| #else
|
| const IPC::Message* print_msg =
|
| - render_thread_.sink().GetUniqueMessageMatching(
|
| + render_thread_->sink().GetUniqueMessageMatching(
|
| PrintHostMsg_DidPrintPage::ID);
|
| bool did_print_msg = (NULL != print_msg);
|
| ASSERT_EQ(printed, did_print_msg);
|
| @@ -121,7 +121,7 @@ class PrintWebViewHelperTest : public PrintWebViewHelperTestBase {
|
| virtual ~PrintWebViewHelperTest() {}
|
|
|
| virtual void SetUp() {
|
| - RenderViewTest::SetUp();
|
| + ChromeRenderViewTest::SetUp();
|
| }
|
|
|
| protected:
|
| @@ -151,7 +151,7 @@ TEST_F(PrintWebViewHelperTest, PrintWithJavascript) {
|
| // frequently.
|
| TEST_F(PrintWebViewHelperTest, BlockScriptInitiatedPrinting) {
|
| // Pretend user will cancel printing.
|
| - render_thread_.set_print_dialog_user_response(false);
|
| + chrome_render_thread_->set_print_dialog_user_response(false);
|
| // Try to print with window.print() a few times.
|
| LoadHTML(kPrintWithJSHTML);
|
| LoadHTML(kPrintWithJSHTML);
|
| @@ -159,13 +159,13 @@ TEST_F(PrintWebViewHelperTest, BlockScriptInitiatedPrinting) {
|
| VerifyPagesPrinted(false);
|
|
|
| // Pretend user will print. (but printing is blocked.)
|
| - render_thread_.set_print_dialog_user_response(true);
|
| + chrome_render_thread_->set_print_dialog_user_response(true);
|
| LoadHTML(kPrintWithJSHTML);
|
| VerifyPagesPrinted(false);
|
|
|
| // Unblock script initiated printing and verify printing works.
|
| PrintWebViewHelper::Get(view_)->ResetScriptedPrintCount();
|
| - render_thread_.printer()->ResetPrinter();
|
| + chrome_render_thread_->printer()->ResetPrinter();
|
| LoadHTML(kPrintWithJSHTML);
|
| VerifyPageCount(1);
|
| VerifyPagesPrinted(true);
|
| @@ -201,7 +201,7 @@ TEST_F(PrintWebViewHelperTest, PrintWithIframe) {
|
| PrintWebViewHelper::Get(view_)->OnPrintPages();
|
|
|
| // Verify output through MockPrinter.
|
| - const MockPrinter* printer(render_thread_.printer());
|
| + const MockPrinter* printer(chrome_render_thread_->printer());
|
| ASSERT_EQ(1, printer->GetPrintedPages());
|
| const printing::Image& image1(printer->GetPrintedPage(0)->image());
|
|
|
| @@ -258,7 +258,7 @@ const TestPageData kTestPages[] = {
|
| TEST_F(PrintWebViewHelperTest, PrintLayoutTest) {
|
| bool baseline = false;
|
|
|
| - EXPECT_TRUE(render_thread_.printer() != NULL);
|
| + EXPECT_TRUE(chrome_render_thread_->printer() != NULL);
|
| for (size_t i = 0; i < arraysize(kTestPages); ++i) {
|
| // Load an HTML page and print it.
|
| LoadHTML(kTestPages[i].page);
|
| @@ -270,12 +270,12 @@ TEST_F(PrintWebViewHelperTest, PrintLayoutTest) {
|
| // has been already finished.
|
| // So, we can start checking the output pages of this printing job.
|
| // Retrieve the number of pages actually printed.
|
| - size_t pages = render_thread_.printer()->GetPrintedPages();
|
| + size_t pages = chrome_render_thread_->printer()->GetPrintedPages();
|
| EXPECT_EQ(kTestPages[i].printed_pages, pages);
|
|
|
| // Retrieve the width and height of the output page.
|
| - int width = render_thread_.printer()->GetWidth(0);
|
| - int height = render_thread_.printer()->GetHeight(0);
|
| + int width = chrome_render_thread_->printer()->GetWidth(0);
|
| + int height = chrome_render_thread_->printer()->GetHeight(0);
|
|
|
| // Check with margin for error. This has been failing with a one pixel
|
| // offset on our buildbot.
|
| @@ -288,7 +288,8 @@ TEST_F(PrintWebViewHelperTest, PrintLayoutTest) {
|
| // Retrieve the checksum of the bitmap data from the pseudo printer and
|
| // compare it with the expected result.
|
| std::string bitmap_actual;
|
| - EXPECT_TRUE(render_thread_.printer()->GetBitmapChecksum(0, &bitmap_actual));
|
| + EXPECT_TRUE(
|
| + chrome_render_thread_->printer()->GetBitmapChecksum(0, &bitmap_actual));
|
| if (kTestPages[i].checksum)
|
| EXPECT_EQ(kTestPages[i].checksum, bitmap_actual);
|
|
|
| @@ -297,11 +298,11 @@ TEST_F(PrintWebViewHelperTest, PrintLayoutTest) {
|
| // create base-line results.
|
| FilePath source_path;
|
| file_util::CreateTemporaryFile(&source_path);
|
| - render_thread_.printer()->SaveSource(0, source_path);
|
| + chrome_render_thread_->printer()->SaveSource(0, source_path);
|
|
|
| FilePath bitmap_path;
|
| file_util::CreateTemporaryFile(&bitmap_path);
|
| - render_thread_.printer()->SaveBitmap(0, bitmap_path);
|
| + chrome_render_thread_->printer()->SaveBitmap(0, bitmap_path);
|
| }
|
| }
|
| }
|
| @@ -319,26 +320,27 @@ class PrintWebViewHelperPreviewTest : public PrintWebViewHelperTestBase {
|
| CommandLine::ForCurrentProcess()->AppendSwitch(
|
| switches::kEnablePrintPreview);
|
|
|
| - RenderViewTest::SetUp();
|
| + ChromeRenderViewTest::SetUp();
|
| }
|
|
|
| protected:
|
| void VerifyPrintPreviewCancelled(bool did_cancel) {
|
| bool print_preview_cancelled =
|
| - (render_thread_.sink().GetUniqueMessageMatching(
|
| + (render_thread_->sink().GetUniqueMessageMatching(
|
| PrintHostMsg_PrintPreviewCancelled::ID) != NULL);
|
| EXPECT_EQ(did_cancel, print_preview_cancelled);
|
| }
|
|
|
| void VerifyPrintPreviewFailed(bool did_fail) {
|
| - bool print_preview_failed = (render_thread_.sink().GetUniqueMessageMatching(
|
| - PrintHostMsg_PrintPreviewFailed::ID) != NULL);
|
| + bool print_preview_failed =
|
| + (render_thread_->sink().GetUniqueMessageMatching(
|
| + PrintHostMsg_PrintPreviewFailed::ID) != NULL);
|
| EXPECT_EQ(did_fail, print_preview_failed);
|
| }
|
|
|
| void VerifyPrintPreviewGenerated(bool generated_preview) {
|
| const IPC::Message* preview_msg =
|
| - render_thread_.sink().GetUniqueMessageMatching(
|
| + render_thread_->sink().GetUniqueMessageMatching(
|
| PrintHostMsg_MetafileReadyForPrinting::ID);
|
| bool did_get_preview_msg = (NULL != preview_msg);
|
| ASSERT_EQ(generated_preview, did_get_preview_msg);
|
| @@ -352,14 +354,14 @@ class PrintWebViewHelperPreviewTest : public PrintWebViewHelperTestBase {
|
| }
|
|
|
| void VerifyPrintFailed(bool did_fail) {
|
| - bool print_failed = (render_thread_.sink().GetUniqueMessageMatching(
|
| + bool print_failed = (render_thread_->sink().GetUniqueMessageMatching(
|
| PrintHostMsg_PrintingFailed::ID) != NULL);
|
| EXPECT_EQ(did_fail, print_failed);
|
| }
|
|
|
| void VerifyPrintPreviewInvalidPrinterSettings(bool settings_invalid) {
|
| bool print_preview_invalid_printer_settings =
|
| - (render_thread_.sink().GetUniqueMessageMatching(
|
| + (render_thread_->sink().GetUniqueMessageMatching(
|
| PrintHostMsg_PrintPreviewInvalidPrinterSettings::ID) != NULL);
|
| EXPECT_EQ(settings_invalid, print_preview_invalid_printer_settings);
|
| }
|
| @@ -367,9 +369,9 @@ class PrintWebViewHelperPreviewTest : public PrintWebViewHelperTestBase {
|
| // |page_number| is 0-based.
|
| void VerifyDidPreviewPage(bool generate_draft_pages, int page_number) {
|
| bool msg_found = false;
|
| - size_t msg_count = render_thread_.sink().message_count();
|
| + size_t msg_count = render_thread_->sink().message_count();
|
| for (size_t i = 0; i < msg_count; ++i) {
|
| - const IPC::Message* msg = render_thread_.sink().GetMessageAt(i);
|
| + const IPC::Message* msg = render_thread_->sink().GetMessageAt(i);
|
| if (msg->type() == PrintHostMsg_DidPreviewPage::ID) {
|
| PrintHostMsg_DidPreviewPage::Param page_param;
|
| PrintHostMsg_DidPreviewPage::Read(msg, &page_param);
|
| @@ -399,7 +401,7 @@ TEST_F(PrintWebViewHelperPreviewTest, OnPrintPreview) {
|
| CreatePrintSettingsDictionary(&dict);
|
| OnPrintPreview(dict);
|
|
|
| - EXPECT_EQ(0, render_thread_.print_preview_pages_remaining());
|
| + EXPECT_EQ(0, chrome_render_thread_->print_preview_pages_remaining());
|
| VerifyPrintPreviewCancelled(false);
|
| VerifyPrintPreviewFailed(false);
|
| VerifyPrintPreviewGenerated(true);
|
| @@ -448,7 +450,7 @@ TEST_F(PrintWebViewHelperPreviewTest, OnPrintPreviewFail) {
|
| DictionaryValue empty_dict;
|
| OnPrintPreview(empty_dict);
|
|
|
| - EXPECT_EQ(0, render_thread_.print_preview_pages_remaining());
|
| + EXPECT_EQ(0, chrome_render_thread_->print_preview_pages_remaining());
|
| VerifyPrintPreviewCancelled(false);
|
| VerifyPrintPreviewFailed(true);
|
| VerifyPrintPreviewGenerated(false);
|
| @@ -460,13 +462,14 @@ TEST_F(PrintWebViewHelperPreviewTest, OnPrintPreviewCancel) {
|
| LoadHTML(kLongPageHTML);
|
|
|
| const int kCancelPage = 3;
|
| - render_thread_.set_print_preview_cancel_page_number(kCancelPage);
|
| + chrome_render_thread_->set_print_preview_cancel_page_number(kCancelPage);
|
| // Fill in some dummy values.
|
| DictionaryValue dict;
|
| CreatePrintSettingsDictionary(&dict);
|
| OnPrintPreview(dict);
|
|
|
| - EXPECT_EQ(kCancelPage, render_thread_.print_preview_pages_remaining());
|
| + EXPECT_EQ(kCancelPage,
|
| + chrome_render_thread_->print_preview_pages_remaining());
|
| VerifyPrintPreviewCancelled(true);
|
| VerifyPrintPreviewFailed(false);
|
| VerifyPrintPreviewGenerated(false);
|
| @@ -506,7 +509,7 @@ TEST_F(PrintWebViewHelperPreviewTest,
|
| LoadHTML(kPrintPreviewHTML);
|
|
|
| // Set mock printer to provide invalid settings.
|
| - render_thread_.printer()->UseInvalidSettings();
|
| + chrome_render_thread_->printer()->UseInvalidSettings();
|
|
|
| // Fill in some dummy values.
|
| DictionaryValue dict;
|
| @@ -515,7 +518,7 @@ TEST_F(PrintWebViewHelperPreviewTest,
|
|
|
| // We should have received invalid printer settings from |printer_|.
|
| VerifyPrintPreviewInvalidPrinterSettings(true);
|
| - EXPECT_EQ(0, render_thread_.print_preview_pages_remaining());
|
| + EXPECT_EQ(0, chrome_render_thread_->print_preview_pages_remaining());
|
|
|
| // It should receive the invalid printer settings message only.
|
| VerifyPrintPreviewFailed(false);
|
| @@ -527,7 +530,7 @@ TEST_F(PrintWebViewHelperPreviewTest,
|
| LoadHTML(kPrintPreviewHTML);
|
|
|
| // Set mock printer to provide invalid settings.
|
| - render_thread_.printer()->UseInvalidSettings();
|
| + chrome_render_thread_->printer()->UseInvalidSettings();
|
|
|
| // Fill in some dummy values.
|
| DictionaryValue dict;
|
|
|