diff options
author | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-21 21:54:32 +0000 |
---|---|---|
committer | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-21 21:54:32 +0000 |
commit | 37d638846ffe96d219f873fa0fcf64f5b699ea4c (patch) | |
tree | 24edf56847bdbe57f9b3dba9f69a64196c8b31d8 /printing/printing_context_win_unittest.cc | |
parent | 715aef65e07bb9e689a408590fbbba9b3b29ec78 (diff) | |
download | chromium_src-37d638846ffe96d219f873fa0fcf64f5b699ea4c.zip chromium_src-37d638846ffe96d219f873fa0fcf64f5b699ea4c.tar.gz chromium_src-37d638846ffe96d219f873fa0fcf64f5b699ea4c.tar.bz2 |
Revert 252221 "Use DocumentProperties to get default DEVMODE ins..."
> Use DocumentProperties to get default DEVMODE instead of PRINTER_INFO_*.
> Fixed ScopedPrinterHandle::OpenPrinter interface.
>
> Review URL: https://codereview.chromium.org/168003002
TBR=vitalybuka@chromium.org
BUG=345746
Review URL: https://codereview.chromium.org/175173005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252658 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/printing_context_win_unittest.cc')
-rw-r--r-- | printing/printing_context_win_unittest.cc | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/printing/printing_context_win_unittest.cc b/printing/printing_context_win_unittest.cc index b28d996..0590229 100644 --- a/printing/printing_context_win_unittest.cc +++ b/printing/printing_context_win_unittest.cc @@ -12,27 +12,24 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" #include "printing/backend/printing_info_win.h" -#include "printing/backend/win_helper.h" #include "printing/printing_test.h" #include "printing/printing_context.h" #include "printing/printing_context_win.h" #include "printing/print_settings.h" #include "testing/gtest/include/gtest/gtest.h" -namespace printing { - // This test is automatically disabled if no printer is available. class PrintingContextTest : public PrintingTest<testing::Test> { public: - void PrintSettingsCallback(PrintingContext::Result result) { + void PrintSettingsCallback(printing::PrintingContext::Result result) { result_ = result; } protected: - PrintingContext::Result result() const { return result_; } + printing::PrintingContext::Result result() const { return result_; } private: - PrintingContext::Result result_; + printing::PrintingContext::Result result_; }; // This is a fake PrintDlgEx implementation that sets the right fields in @@ -49,9 +46,9 @@ HRESULT WINAPI PrintDlgExMock(LPPRINTDLGEX lppd) { lppd->lpPageRanges[0].nToPage = 5; // Painful paperwork. - base::string16 printer_name = PrintingContextTest::GetDefaultPrinter(); - ScopedPrinterHandle printer; - if (!printer.OpenPrinter(printer_name)) + std::wstring printer_name = PrintingContextTest::GetDefaultPrinter(); + HANDLE printer; + if (!OpenPrinter(const_cast<wchar_t*>(printer_name.c_str()), &printer, NULL)) return E_FAIL; scoped_ptr<uint8[]> buffer; @@ -61,7 +58,7 @@ HRESULT WINAPI PrintDlgExMock(LPPRINTDLGEX lppd) { lppd->hDevMode = NULL; lppd->hDevNames = NULL; - PrinterInfo2 info_2; + printing::PrinterInfo2 info_2; if (info_2.Init(printer)) { dev_mode = info_2.get()->pDevMode; } @@ -70,7 +67,7 @@ HRESULT WINAPI PrintDlgExMock(LPPRINTDLGEX lppd) { goto Cleanup; } - if (!PrintingContextWin::AllocateContext(printer_name, dev_mode, + if (!printing::PrintingContextWin::AllocateContext(printer_name, dev_mode, &lppd->hDC)) { result = E_FAIL; goto Cleanup; @@ -140,6 +137,7 @@ Cleanup: GlobalFree(lppd->hDevNames); } } + ClosePrinter(printer); return result; } @@ -147,11 +145,12 @@ TEST_F(PrintingContextTest, Base) { if (IsTestCaseDisabled()) return; - PrintSettings settings; + printing::PrintSettings settings; settings.set_device_name(GetDefaultPrinter()); // Initialize it. - scoped_ptr<PrintingContext> context(PrintingContext::Create(std::string())); - EXPECT_EQ(PrintingContext::OK, context->InitWithSettings(settings)); + scoped_ptr<printing::PrintingContext> context( + printing::PrintingContext::Create(std::string())); + EXPECT_EQ(printing::PrintingContext::OK, context->InitWithSettings(settings)); // The print may lie to use and may not support world transformation. // Verify right now. @@ -166,14 +165,12 @@ TEST_F(PrintingContextTest, PrintAll) { return; std::string dummy_locale; - PrintingContextWin context(dummy_locale); + printing::PrintingContextWin context(dummy_locale); context.SetPrintDialog(&PrintDlgExMock); context.AskUserForSettings( NULL, 123, false, base::Bind(&PrintingContextTest::PrintSettingsCallback, base::Unretained(this))); - EXPECT_EQ(PrintingContext::OK, result()); - PrintSettings settings = context.settings(); + EXPECT_EQ(printing::PrintingContext::OK, result()); + printing::PrintSettings settings = context.settings(); EXPECT_EQ(settings.ranges().size(), 0); } - -} // namespace printing |