diff options
author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 20:58:51 +0000 |
---|---|---|
committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 20:58:51 +0000 |
commit | d91db11a358380d9581130cd785f824282207d42 (patch) | |
tree | a2c0f521aba51b95d195b8d45c38aa647c13e8b8 /printing/emf_win_unittest.cc | |
parent | c54c43e735b1e3e5e6900700d1accec4fcbf5926 (diff) | |
download | chromium_src-d91db11a358380d9581130cd785f824282207d42.zip chromium_src-d91db11a358380d9581130cd785f824282207d42.tar.gz chromium_src-d91db11a358380d9581130cd785f824282207d42.tar.bz2 |
Cleanup: Remove unneeded namespaces.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8334007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106129 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/emf_win_unittest.cc')
-rw-r--r-- | printing/emf_win_unittest.cc | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/printing/emf_win_unittest.cc b/printing/emf_win_unittest.cc index 01395a9..add23f9 100644 --- a/printing/emf_win_unittest.cc +++ b/printing/emf_win_unittest.cc @@ -50,7 +50,7 @@ TEST(EmfTest, DC) { uint32 size; std::vector<BYTE> data; { - printing::Emf emf; + Emf emf; EXPECT_TRUE(emf.Init()); EXPECT_TRUE(emf.context() != NULL); // An empty EMF is invalid, so we put at least a rectangle in it. @@ -63,7 +63,7 @@ TEST(EmfTest, DC) { } // Playback the data. - printing::Emf emf; + Emf emf; EXPECT_TRUE(emf.InitFromData(&data.front(), size)); HDC hdc = CreateCompatibleDC(NULL); EXPECT_TRUE(hdc); @@ -77,15 +77,14 @@ TEST_F(EmfPrintingTest, Enumerate) { if (IsTestCaseDisabled()) return; - printing::PrintSettings settings; + PrintSettings settings; // My test case is a HP Color LaserJet 4550 PCL. settings.set_device_name(L"UnitTest Printer"); // Initialize it. - scoped_ptr<printing::PrintingContext> context( - printing::PrintingContext::Create(std::string())); - EXPECT_EQ(context->InitWithSettings(settings), printing::PrintingContext::OK); + scoped_ptr<PrintingContext> context(PrintingContext::Create(std::string())); + EXPECT_EQ(context->InitWithSettings(settings), PrintingContext::OK); FilePath emf_file; EXPECT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &emf_file)); @@ -94,22 +93,22 @@ TEST_F(EmfPrintingTest, Enumerate) { .Append(FILE_PATH_LITERAL("data")) .Append(FILE_PATH_LITERAL("test4.emf")); // Load any EMF with an image. - printing::Emf emf; + Emf emf; std::string emf_data; file_util::ReadFileToString(emf_file, &emf_data); ASSERT_TRUE(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 + // unit_test, PrintingContext automatically dumps its files to the // current directory. // TODO(maruel): Clean the .PRN file generated in current directory. context->NewDocument(L"EmfTest.Enumerate"); context->NewPage(); // Process one at a time. - printing::Emf::Enumerator emf_enum(emf, context->context(), - &emf.GetPageBounds(1).ToRECT()); - for (printing::Emf::Enumerator::const_iterator itr = emf_enum.begin(); + Emf::Enumerator emf_enum(emf, context->context(), + &emf.GetPageBounds(1).ToRECT()); + for (Emf::Enumerator::const_iterator itr = emf_enum.begin(); itr != emf_enum.end(); ++itr) { // To help debugging. @@ -133,7 +132,7 @@ TEST_F(EmfPrintingTest, PageBreak) { uint32 size; std::vector<BYTE> data; { - printing::Emf emf; + Emf emf; EXPECT_TRUE(emf.Init()); EXPECT_TRUE(emf.context() != NULL); int pages = 3; @@ -155,7 +154,7 @@ TEST_F(EmfPrintingTest, PageBreak) { di.cbSize = sizeof(DOCINFO); di.lpszDocName = L"Test Job"; int job_id = ::StartDoc(dc.Get(), &di); - printing::Emf emf; + Emf emf; EXPECT_TRUE(emf.InitFromData(&data.front(), size)); EXPECT_TRUE(emf.SafePlayback(dc.Get())); ::EndDoc(dc.Get()); @@ -178,7 +177,7 @@ TEST(EmfTest, FileBackedEmf) { uint32 size; std::vector<BYTE> data; { - printing::Emf emf; + Emf emf; EXPECT_TRUE(emf.InitToFile(metafile_path)); EXPECT_TRUE(emf.context() != NULL); // An empty EMF is invalid, so we put at least a rectangle in it. @@ -196,7 +195,7 @@ TEST(EmfTest, FileBackedEmf) { // Playback the data. HDC hdc = CreateCompatibleDC(NULL); EXPECT_TRUE(hdc); - printing::Emf emf; + Emf emf; EXPECT_TRUE(emf.InitFromFile(metafile_path)); RECT output_rect = {0, 0, 10, 10}; EXPECT_TRUE(emf.Playback(hdc, &output_rect)); |