| Index: printing/emf_win_unittest.cc
|
| diff --git a/printing/emf_win_unittest.cc b/printing/emf_win_unittest.cc
|
| index ec65c2844a964857bb98f4bfcfcf10a762d6b585..8a5daaff4ef064d40fb1bf64978bf5df1ca92fc8 100644
|
| --- a/printing/emf_win_unittest.cc
|
| +++ b/printing/emf_win_unittest.cc
|
| @@ -22,13 +22,11 @@
|
| #include "ui/gfx/point.h"
|
| #include "ui/gfx/size.h"
|
|
|
| -namespace printing {
|
| -
|
| namespace {
|
|
|
| // This test is automatically disabled if no printer named "UnitTest Printer" is
|
| // available.
|
| -class EmfPrintingTest : public testing::Test, public PrintingContext::Delegate {
|
| +class EmfPrintingTest : public testing::Test {
|
| public:
|
| typedef testing::Test Parent;
|
| static bool IsTestCaseDisabled() {
|
| @@ -39,15 +37,13 @@
|
| DeleteDC(hdc);
|
| return false;
|
| }
|
| -
|
| - // PrintingContext::Delegate methods.
|
| - virtual gfx::NativeView GetParentView() OVERRIDE { return NULL; }
|
| - virtual std::string GetAppLocale() OVERRIDE { return std::string(); }
|
| };
|
|
|
| const uint32 EMF_HEADER_SIZE = 128;
|
|
|
| } // namespace
|
| +
|
| +namespace printing {
|
|
|
| TEST(EmfTest, DC) {
|
| // Simplest use case.
|
| @@ -87,7 +83,7 @@
|
| settings.set_device_name(L"UnitTest Printer");
|
|
|
| // Initialize it.
|
| - scoped_ptr<PrintingContext> context(PrintingContext::Create(this));
|
| + scoped_ptr<PrintingContext> context(PrintingContext::Create(std::string()));
|
| EXPECT_EQ(context->InitWithSettings(settings), PrintingContext::OK);
|
|
|
| base::FilePath emf_file;
|
|
|