summaryrefslogtreecommitdiffstats
path: root/printing/emf_win_unittest.cc
diff options
context:
space:
mode:
authorvandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-17 23:22:06 +0000
committervandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-17 23:22:06 +0000
commit89eff96a76bce1e4db7208f911756c3720c0ce5b (patch)
tree230e807550a8110e06c005a897cf3a5977288a8c /printing/emf_win_unittest.cc
parent3e737d0ea26703f67dc591086a9ace4678e74e9b (diff)
downloadchromium_src-89eff96a76bce1e4db7208f911756c3720c0ce5b.zip
chromium_src-89eff96a76bce1e4db7208f911756c3720c0ce5b.tar.gz
chromium_src-89eff96a76bce1e4db7208f911756c3720c0ce5b.tar.bz2
Stop overloading Init() in NativeMetafile.
BUG=NONE TEST=NONE Review URL: http://codereview.chromium.org/6709009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78625 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/emf_win_unittest.cc')
-rw-r--r--printing/emf_win_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/printing/emf_win_unittest.cc b/printing/emf_win_unittest.cc
index 9ae9323..2f4e2ae 100644
--- a/printing/emf_win_unittest.cc
+++ b/printing/emf_win_unittest.cc
@@ -62,7 +62,7 @@ TEST(EmfTest, DC) {
// Playback the data.
hdc = CreateCompatibleDC(NULL);
EXPECT_TRUE(hdc);
- EXPECT_TRUE(emf.Init(&data.front(), size));
+ EXPECT_TRUE(emf.InitFromData(&data.front(), size));
RECT output_rect = {0, 0, 10, 10};
EXPECT_TRUE(emf.Playback(hdc, &output_rect));
EXPECT_TRUE(DeleteDC(hdc));
@@ -94,7 +94,7 @@ TEST_F(EmfPrintingTest, Enumerate) {
std::string emf_data;
file_util::ReadFileToString(emf_file, &emf_data);
ASSERT_TRUE(emf_data.size());
- EXPECT_TRUE(emf.Init(&emf_data[0], emf_data.size()));
+ EXPECT_TRUE(emf.InitFromData(&emf_data[0], emf_data.size()));
// This will print to file. The reason is that when running inside a
// unit_test, printing::PrintingContext automatically dumps its files to the
@@ -148,7 +148,7 @@ TEST_F(EmfPrintingTest, PageBreak) {
di.cbSize = sizeof(DOCINFO);
di.lpszDocName = L"Test Job";
int job_id = ::StartDoc(dc.Get(), &di);
- EXPECT_TRUE(emf.Init(&data.front(), size));
+ EXPECT_TRUE(emf.InitFromData(&data.front(), size));
EXPECT_TRUE(emf.SafePlayback(dc.Get()));
::EndDoc(dc.Get());
// Since presumably the printer is not real, let us just delete the job from