Index: printing/printing_context_win_unittest.cc |
diff --git a/printing/printing_context_win_unittest.cc b/printing/printing_context_win_unittest.cc |
index 1d27935be5508835b056af98e9e73bc87a41d1b2..c9facc9c0b8cc3f7c3a795934afeca5c9f62e3b6 100644 |
--- a/printing/printing_context_win_unittest.cc |
+++ b/printing/printing_context_win_unittest.cc |
@@ -22,16 +22,11 @@ |
namespace printing { |
// This test is automatically disabled if no printer is available. |
-class PrintingContextTest : public PrintingTest<testing::Test>, |
- public PrintingContext::Delegate { |
+class PrintingContextTest : public PrintingTest<testing::Test> { |
public: |
void PrintSettingsCallback(PrintingContext::Result result) { |
result_ = result; |
} |
- |
- // PrintingContext::Delegate methods. |
- virtual gfx::NativeView GetParentView() OVERRIDE { return NULL; } |
- virtual std::string GetAppLocale() OVERRIDE { return std::string(); } |
protected: |
PrintingContext::Result result() const { return result_; } |
@@ -42,7 +37,7 @@ |
class MockPrintingContextWin : public PrintingContextWin { |
public: |
- MockPrintingContextWin(Delegate* delegate) : PrintingContextWin(delegate) {} |
+ MockPrintingContextWin() : PrintingContextWin("") {} |
protected: |
// This is a fake PrintDlgEx implementation that sets the right fields in |
@@ -164,7 +159,7 @@ |
PrintSettings settings; |
settings.set_device_name(GetDefaultPrinter()); |
// Initialize it. |
- scoped_ptr<PrintingContext> context(PrintingContext::Create(this)); |
+ scoped_ptr<PrintingContext> context(PrintingContext::Create(std::string())); |
EXPECT_EQ(PrintingContext::OK, context->InitWithSettings(settings)); |
// The print may lie to use and may not support world transformation. |
@@ -179,12 +174,10 @@ |
if (IsTestCaseDisabled()) |
return; |
- MockPrintingContextWin context(this); |
+ MockPrintingContextWin context; |
context.AskUserForSettings( |
- 123, |
- false, |
- base::Bind(&PrintingContextTest::PrintSettingsCallback, |
- base::Unretained(this))); |
+ NULL, 123, false, base::Bind(&PrintingContextTest::PrintSettingsCallback, |
+ base::Unretained(this))); |
EXPECT_EQ(PrintingContext::OK, result()); |
PrintSettings settings = context.settings(); |
EXPECT_EQ(settings.ranges().size(), 0); |