summaryrefslogtreecommitdiffstats
path: root/printing
diff options
context:
space:
mode:
authorcpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-14 03:37:14 +0000
committercpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-14 03:37:14 +0000
commit46db9f43fe29b92895d3138a22d3bc042632135a (patch)
tree00d16d75a583afb05e3df73d76ff04b0b5562bb6 /printing
parentc6aef90f9f927ac75bb99d6d77782fc33c37769d (diff)
downloadchromium_src-46db9f43fe29b92895d3138a22d3bc042632135a.zip
chromium_src-46db9f43fe29b92895d3138a22d3bc042632135a.tar.gz
chromium_src-46db9f43fe29b92895d3138a22d3bc042632135a.tar.bz2
Make scoped dc objects smarter
So we don't destroy the dc with gdi objects selected. Also remove implicit conversion to HDC. BUG=110113,113683 TEST=chrome runs, base unittests green. Review URL: https://chromiumcodereview.appspot.com/9212020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121840 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
-rw-r--r--printing/emf_win_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/printing/emf_win_unittest.cc b/printing/emf_win_unittest.cc
index add23f9..5ed83d1 100644
--- a/printing/emf_win_unittest.cc
+++ b/printing/emf_win_unittest.cc
@@ -127,7 +127,7 @@ TEST_F(EmfPrintingTest, Enumerate) {
TEST_F(EmfPrintingTest, PageBreak) {
base::win::ScopedCreateDC dc(
CreateDC(L"WINSPOOL", L"UnitTest Printer", NULL, NULL));
- if (!dc.Get())
+ if (!dc.get())
return;
uint32 size;
std::vector<BYTE> data;
@@ -153,11 +153,11 @@ TEST_F(EmfPrintingTest, PageBreak) {
DOCINFO di = {0};
di.cbSize = sizeof(DOCINFO);
di.lpszDocName = L"Test Job";
- int job_id = ::StartDoc(dc.Get(), &di);
+ int job_id = ::StartDoc(dc.get(), &di);
Emf emf;
EXPECT_TRUE(emf.InitFromData(&data.front(), size));
- EXPECT_TRUE(emf.SafePlayback(dc.Get()));
- ::EndDoc(dc.Get());
+ EXPECT_TRUE(emf.SafePlayback(dc.get()));
+ ::EndDoc(dc.get());
// Since presumably the printer is not real, let us just delete the job from
// the queue.
HANDLE printer = NULL;