diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-07 20:11:24 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-07 20:11:24 +0000 |
| commit | e8980a56e8dcc4657cd1304665c0c03ff44d20c2 (patch) | |
| tree | d1c65e184609602981383b17ebaef868c99b499b /printing/emf_win_unittest.cc | |
| parent | 368ddad78d3f2eac1ea7a92cfb9716ecd0166279 (diff) | |
| download | chromium_src-e8980a56e8dcc4657cd1304665c0c03ff44d20c2.zip chromium_src-e8980a56e8dcc4657cd1304665c0c03ff44d20c2.tar.gz chromium_src-e8980a56e8dcc4657cd1304665c0c03ff44d20c2.tar.bz2 | |
Printing: Standardize on Metafile::Init, removing Emf::CreateFromData in the
process and any ifdefs needed for this.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3595016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61834 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/emf_win_unittest.cc')
| -rw-r--r-- | printing/emf_win_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/printing/emf_win_unittest.cc b/printing/emf_win_unittest.cc index bfd56b8..d0e9684 100644 --- a/printing/emf_win_unittest.cc +++ b/printing/emf_win_unittest.cc @@ -59,7 +59,7 @@ TEST(EmfTest, DC) { // Playback the data. hdc = CreateCompatibleDC(NULL); EXPECT_TRUE(hdc); - EXPECT_TRUE(emf.CreateFromData(&data.front(), size)); + EXPECT_TRUE(emf.Init(&data.front(), size)); RECT output_rect = {0, 0, 10, 10}; EXPECT_TRUE(emf.Playback(hdc, &output_rect)); EXPECT_TRUE(DeleteDC(hdc)); @@ -91,7 +91,7 @@ TEST_F(EmfPrintingTest, Enumerate) { std::string emf_data; file_util::ReadFileToString(emf_file, &emf_data); ASSERT_TRUE(emf_data.size()); - EXPECT_TRUE(emf.CreateFromData(&emf_data[0], emf_data.size())); + EXPECT_TRUE(emf.Init(&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 @@ -144,7 +144,7 @@ TEST_F(EmfPrintingTest, PageBreak) { di.cbSize = sizeof(DOCINFO); di.lpszDocName = L"Test Job"; int job_id = ::StartDoc(dc.Get(), &di); - EXPECT_TRUE(emf.CreateFromData(&data.front(), size)); + EXPECT_TRUE(emf.Init(&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 |