summaryrefslogtreecommitdiffstats
path: root/printing/emf_win_unittest.cc
diff options
context:
space:
mode:
authorfinnur <finnur@chromium.org>2014-08-25 03:08:15 -0700
committerCommit bot <commit-bot@chromium.org>2014-08-25 10:09:09 +0000
commitc921afdcc249a89bd9e8cc1cc898e4c320cc5d03 (patch)
treed3a070f77fb354815c81dcd1d993783d298deab0 /printing/emf_win_unittest.cc
parentbb1bd87a4fad403340fe8e3168552a933954a535 (diff)
downloadchromium_src-c921afdcc249a89bd9e8cc1cc898e4c320cc5d03.zip
chromium_src-c921afdcc249a89bd9e8cc1cc898e4c320cc5d03.tar.gz
chromium_src-c921afdcc249a89bd9e8cc1cc898e4c320cc5d03.tar.bz2
Revert of Added PrintingContext::Delegate to get parent view handle and application locale. (patchset #13 of https://codereview.chromium.org/478183005/)
Reason for revert: PrintJobTest.SimplePrint leaking on Linux ASAN bots since this was checked in: http://build.chromium.org/p/chromium.memory/builders/Linux%20ASan%20LSan%20Tests%20%282%29?numbuilds=100 This CL looks like the likeliest culprit. Original issue's description: > Added PrintingContext::Delegate to get parent view handle and application locale. > > BUG=374321 > > Committed: https://chromium.googlesource.com/chromium/src/+/ee8f4e4029c09ba77e7dbb8fddd85186642b3de8 TBR=noamsml@chromium.org,inferno@chromium.org,yzshen@chromium.org,thestig@chromium.org,jschuh@chromium.org,vitalybuka@chromium.org NOTREECHECKS=true NOTRY=true BUG=374321 Review URL: https://codereview.chromium.org/504763002 Cr-Commit-Position: refs/heads/master@{#291654}
Diffstat (limited to 'printing/emf_win_unittest.cc')
-rw-r--r--printing/emf_win_unittest.cc12
1 files changed, 4 insertions, 8 deletions
diff --git a/printing/emf_win_unittest.cc b/printing/emf_win_unittest.cc
index ec65c28..8a5daaf 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,16 +37,14 @@ class EmfPrintingTest : public testing::Test, public PrintingContext::Delegate {
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.
uint32 size;
@@ -87,7 +83,7 @@ TEST_F(EmfPrintingTest, Enumerate) {
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;