Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(405)

Unified Diff: printing/emf_win_unittest.cc

Issue 6709009: Stop overloading Init() in NativeMetafile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « printing/emf_win.cc ('k') | printing/image.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/emf_win_unittest.cc
diff --git a/printing/emf_win_unittest.cc b/printing/emf_win_unittest.cc
index 9ae9323aa211f90beac68d070ed7f7fe2a04c341..2f4e2ae7a2608e46559d1467a7f0a5900d880ed7 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
« no previous file with comments | « printing/emf_win.cc ('k') | printing/image.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698