| Index: printing/emf_win_unittest.cc
|
| diff --git a/printing/emf_win_unittest.cc b/printing/emf_win_unittest.cc
|
| index 4312b2ca7c389549ab40b3626f1e2a6eff086edd..20b4a39c34f4385c58ef1a5758405f2779300a7e 100644
|
| --- a/printing/emf_win_unittest.cc
|
| +++ b/printing/emf_win_unittest.cc
|
| @@ -15,6 +15,7 @@
|
| #include "base/scoped_ptr.h"
|
| #include "base/scoped_temp_dir.h"
|
| #include "base/win/scoped_hdc.h"
|
| +#include "printing/native_metafile_factory.h"
|
| #include "printing/printing_context.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -160,7 +161,8 @@ TEST_F(EmfPrintingTest, PageBreak) {
|
|
|
| TEST(EmfTest, FileBackedDC) {
|
| // Simplest use case.
|
| - printing::Emf emf;
|
| + scoped_ptr<printing::NativeMetafile> emf(
|
| + printing::NativeMetafileFactory::CreateMetafile());
|
| RECT rect = {100, 100, 200, 200};
|
| HDC hdc = CreateCompatibleDC(NULL);
|
| EXPECT_TRUE(hdc != NULL);
|
| @@ -169,17 +171,17 @@ TEST(EmfTest, FileBackedDC) {
|
| FilePath metafile_path;
|
| EXPECT_TRUE(file_util::CreateTemporaryFileInDir(scratch_metafile_dir.path(),
|
| &metafile_path));
|
| - EXPECT_TRUE(emf.CreateFileBackedDc(hdc, &rect, metafile_path));
|
| - EXPECT_TRUE(emf.hdc() != NULL);
|
| + EXPECT_TRUE(emf->CreateFileBackedDc(hdc, &rect, metafile_path));
|
| + EXPECT_TRUE(emf->hdc() != NULL);
|
| // In theory, you'd use the HDC with GDI functions here.
|
| - EXPECT_TRUE(emf.CloseDc());
|
| + EXPECT_TRUE(emf->CloseDc());
|
|
|
| - uint32 size = emf.GetDataSize();
|
| + uint32 size = emf->GetDataSize();
|
| EXPECT_EQ(size, EMF_HEADER_SIZE);
|
| std::vector<BYTE> data;
|
| - EXPECT_TRUE(emf.GetData(&data));
|
| + EXPECT_TRUE(emf->GetData(&data));
|
| EXPECT_EQ(data.size(), size);
|
| - emf.CloseEmf();
|
| + emf->CloseEmf();
|
| int64 file_size = 0;
|
| file_util::GetFileSize(metafile_path, &file_size);
|
| EXPECT_EQ(size, file_size);
|
| @@ -188,10 +190,9 @@ TEST(EmfTest, FileBackedDC) {
|
| // Playback the data.
|
| hdc = CreateCompatibleDC(NULL);
|
| EXPECT_TRUE(hdc);
|
| - EXPECT_TRUE(emf.CreateFromFile(metafile_path));
|
| + EXPECT_TRUE(emf->CreateFromFile(metafile_path));
|
| RECT output_rect = {0, 0, 10, 10};
|
| - EXPECT_TRUE(emf.Playback(hdc, &output_rect));
|
| + EXPECT_TRUE(emf->Playback(hdc, &output_rect));
|
| EXPECT_TRUE(DeleteDC(hdc));
|
| - emf.CloseEmf();
|
| + emf->CloseEmf();
|
| }
|
| -
|
|
|