Rename some printing classes and minor cleanups.

Rename:
PdfPsMetafile -> PdfMetafileCairo
PdfMetafile -> PdfMetafileCg (Mac)
VectorPlatformDevice -> VectorPlatformDeviceEmf/Cairo (Windows/Linux varients)

This is in preparation for VectorPlatformDeviceSkia.

BUG=NONE
TEST=NONE

Review URL: http://codereview.chromium.org/6783036

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80390 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 92 insertions, 92 deletions

diff --git a/printing/emf_win.cc b/printing/emf_win.cc
index 849e125..1b5601a 100644
--- a/printing/emf_win.cc
+++ b/printing/emf_win.cc
@@ -9,7 +9,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
-#include "skia/ext/vector_platform_device_win.h"
+#include "skia/ext/vector_platform_device_emf_win.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/codec/png_codec.h"
@@ -409,9 +409,9 @@ skia::PlatformDevice* Emf::StartPageForVectorCanvas(
   if (!StartPage(page_size, content_origin, scale_factor))
     return NULL;
 
-  return skia::VectorPlatformDeviceFactory::CreateDevice(page_size.width(),
-                                                         page_size.height(),
-                                                         true, hdc_);
+  return skia::VectorPlatformDeviceEmfFactory::CreateDevice(page_size.width(),
+                                                            page_size.height(),
+                                                            true, hdc_);
 }
 
 bool Emf::StartPage(const gfx::Size& /*page_size*/,
diff --git a/printing/native_metafile_factory.cc b/printing/native_metafile_factory.cc
index 3b77ae0..5db823e 100644
--- a/printing/native_metafile_factory.cc
+++ b/printing/native_metafile_factory.cc
@@ -9,9 +9,9 @@
 #if defined(OS_WIN)
 #include "printing/emf_win.h"
 #elif defined(OS_MACOSX)
-#include "printing/pdf_metafile_mac.h"
+#include "printing/pdf_metafile_cg_mac.h"
 #elif defined(OS_POSIX)
-#include "printing/pdf_ps_metafile_cairo.h"
+#include "printing/pdf_metafile_cairo_linux.h"
 #endif
 
 namespace printing {
@@ -38,9 +38,9 @@ NativeMetafile* NativeMetafileFactory::CreateNewMetafile(){
 #if defined(OS_WIN)
   return new printing::Emf;
 #elif defined(OS_MACOSX)
-  return new printing::PdfMetafile;
+  return new printing::PdfMetafileCg;
 #elif defined(OS_POSIX)
-  return new printing::PdfPsMetafile;
+  return new printing::PdfMetafileCairo;
 #endif
 }
 
diff --git a/printing/pdf_ps_metafile_cairo.cc b/printing/pdf_metafile_cairo_linux.cc
index a10b125..5780574 100644
--- a/printing/pdf_ps_metafile_cairo.cc
+++ b/printing/pdf_metafile_cairo_linux.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "printing/pdf_ps_metafile_cairo.h"
+#include "printing/pdf_metafile_cairo_linux.h"
 
 #include <stdio.h>
 
@@ -14,7 +14,7 @@
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "printing/units.h"
-#include "skia/ext/vector_platform_device_linux.h"
+#include "skia/ext/vector_platform_device_cairo_linux.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
@@ -65,18 +65,18 @@ cairo_status_t WriteCairoStream(void* dst_buffer,
 
 namespace printing {
 
-PdfPsMetafile::PdfPsMetafile()
+PdfMetafileCairo::PdfMetafileCairo()
     : surface_(NULL),
       context_(NULL),
       current_data_(NULL) {
 }
 
-PdfPsMetafile::~PdfPsMetafile() {
+PdfMetafileCairo::~PdfMetafileCairo() {
   // Releases all resources if we forgot to do so.
   CleanUpAll();
 }
 
-bool PdfPsMetafile::Init() {
+bool PdfMetafileCairo::Init() {
   // We need to check |current_data_| to ensure Init/InitFromData has not been
   // called before.
   DCHECK(!current_data_);
@@ -90,7 +90,7 @@ bool PdfPsMetafile::Init() {
   // Cairo always returns a valid pointer.
   // Hence, we have to check if it points to a "nil" object.
   if (!IsSurfaceValid(surface_)) {
-    DLOG(ERROR) << "Cannot create Cairo surface for PdfPsMetafile!";
+    DLOG(ERROR) << "Cannot create Cairo surface for PdfMetafileCairo!";
     CleanUpSurface(&surface_);
     return false;
   }
@@ -98,7 +98,7 @@ bool PdfPsMetafile::Init() {
   // Creates a context.
   context_ = cairo_create(surface_);
   if (!IsContextValid(context_)) {
-    DLOG(ERROR) << "Cannot create Cairo context for PdfPsMetafile!";
+    DLOG(ERROR) << "Cannot create Cairo context for PdfMetafileCairo!";
     CleanUpContext(&context_);
     CleanUpSurface(&surface_);
     return false;
@@ -107,8 +107,8 @@ bool PdfPsMetafile::Init() {
   return true;
 }
 
-bool PdfPsMetafile::InitFromData(const void* src_buffer,
-                                 uint32 src_buffer_size) {
+bool PdfMetafileCairo::InitFromData(const void* src_buffer,
+                                    uint32 src_buffer_size) {
   if (src_buffer == NULL || src_buffer_size == 0)
     return false;
 
@@ -118,21 +118,19 @@ bool PdfPsMetafile::InitFromData(const void* src_buffer,
   return true;
 }
 
-skia::PlatformDevice* PdfPsMetafile::StartPageForVectorCanvas(
+skia::PlatformDevice* PdfMetafileCairo::StartPageForVectorCanvas(
     const gfx::Size& page_size, const gfx::Point& content_origin,
     const float& scale_factor) {
   if (!StartPage(page_size, content_origin, scale_factor))
     return NULL;
 
-  return skia::VectorPlatformDeviceFactory::CreateDevice(context_,
-                                                         page_size.width(),
-                                                         page_size.height(),
-                                                         true);
+  return skia::VectorPlatformDeviceCairoFactory::CreateDevice(
+      context_, page_size.width(), page_size.height(), true);
 }
 
-bool PdfPsMetafile::StartPage(const gfx::Size& page_size,
-                              const gfx::Point& content_origin,
-                              const float& scale_factor) {
+bool PdfMetafileCairo::StartPage(const gfx::Size& page_size,
+                                 const gfx::Point& content_origin,
+                                 const float& scale_factor) {
   DCHECK(IsSurfaceValid(surface_));
   DCHECK(IsContextValid(context_));
   // Passing this check implies page_surface_ is NULL, and current_page_ is
@@ -151,7 +149,7 @@ bool PdfPsMetafile::StartPage(const gfx::Size& page_size,
   return context_ != NULL;
 }
 
-bool PdfPsMetafile::FinishPage() {
+bool PdfMetafileCairo::FinishPage() {
   DCHECK(IsSurfaceValid(surface_));
   DCHECK(IsContextValid(context_));
 
@@ -161,7 +159,7 @@ bool PdfPsMetafile::FinishPage() {
   return true;
 }
 
-bool PdfPsMetafile::FinishDocument() {
+bool PdfMetafileCairo::FinishDocument() {
   DCHECK(IsSurfaceValid(surface_));
   DCHECK(IsContextValid(context_));
 
@@ -174,7 +172,7 @@ bool PdfPsMetafile::FinishDocument() {
   return true;
 }
 
-uint32 PdfPsMetafile::GetDataSize() const {
+uint32 PdfMetafileCairo::GetDataSize() const {
   // We need to check at least these two members to ensure that either Init()
   // has been called to initialize |data_|, or metafile has been closed.
   DCHECK(!context_);
@@ -183,7 +181,7 @@ uint32 PdfPsMetafile::GetDataSize() const {
   return current_data_->size();
 }
 
-bool PdfPsMetafile::GetData(void* dst_buffer, uint32 dst_buffer_size) const {
+bool PdfMetafileCairo::GetData(void* dst_buffer, uint32 dst_buffer_size) const {
   DCHECK(dst_buffer);
   DCHECK_GT(dst_buffer_size, 0u);
   memcpy(dst_buffer, current_data_->data(), dst_buffer_size);
@@ -191,11 +189,11 @@ bool PdfPsMetafile::GetData(void* dst_buffer, uint32 dst_buffer_size) const {
   return true;
 }
 
-cairo_t* PdfPsMetafile::context() const {
+cairo_t* PdfMetafileCairo::context() const {
   return context_;
 }
 
-bool PdfPsMetafile::SaveTo(const FilePath& file_path) const {
+bool PdfMetafileCairo::SaveTo(const FilePath& file_path) const {
   // We need to check at least these two members to ensure that either Init()
   // has been called to initialize |data_|, or metafile has been closed.
   DCHECK(!context_);
@@ -210,18 +208,18 @@ bool PdfPsMetafile::SaveTo(const FilePath& file_path) const {
   return success;
 }
 
-gfx::Rect PdfPsMetafile::GetPageBounds(unsigned int page_number) const  {
+gfx::Rect PdfMetafileCairo::GetPageBounds(unsigned int page_number) const  {
   NOTIMPLEMENTED();
   return gfx::Rect();
 }
 
-unsigned int PdfPsMetafile::GetPageCount() const {
+unsigned int PdfMetafileCairo::GetPageCount() const {
   NOTIMPLEMENTED();
   return 1;
 }
 
 #if defined(OS_CHROMEOS)
-bool PdfPsMetafile::SaveToFD(const base::FileDescriptor& fd) const {
+bool PdfMetafileCairo::SaveToFD(const base::FileDescriptor& fd) const {
   // We need to check at least these two members to ensure that either Init()
   // has been called to initialize |data_|, or metafile has been closed.
   DCHECK(!context_);
@@ -250,12 +248,12 @@ bool PdfPsMetafile::SaveToFD(const base::FileDescriptor& fd) const {
 }
 #endif  // if defined(OS_CHROMEOS)
 
-void PdfPsMetafile::CleanUpAll() {
+void PdfMetafileCairo::CleanUpAll() {
   CleanUpContext(&context_);
   CleanUpSurface(&surface_);
   cairo_data_.clear();
   raw_data_.clear();
-  skia::VectorPlatformDevice::ClearFontCache();
+  skia::VectorPlatformDeviceCairo::ClearFontCache();
 }
 
 }  // namespace printing
diff --git a/printing/pdf_ps_metafile_cairo.h b/printing/pdf_metafile_cairo_linux.h
index 6d5cf5c..f3a80aa 100644
--- a/printing/pdf_ps_metafile_cairo.h
+++ b/printing/pdf_metafile_cairo_linux.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PRINTING_PDF_PS_METAFILE_CAIRO_H_
-#define PRINTING_PDF_PS_METAFILE_CAIRO_H_
+#ifndef PRINTING_PDF_METAFILE_CAIRO_LINUX_H_
+#define PRINTING_PDF_METAFILE_CAIRO_LINUX_H_
 
 #include <string>
 
@@ -23,9 +23,9 @@ namespace printing {
 
 // This class uses Cairo graphics library to generate PDF stream and stores
 // rendering results in a string buffer.
-class PdfPsMetafile : public NativeMetafile {
+class PdfMetafileCairo : public NativeMetafile {
  public:
-  virtual ~PdfPsMetafile();
+  virtual ~PdfMetafileCairo();
 
   // NativeMetafile methods.
   virtual bool Init();
@@ -59,11 +59,11 @@ class PdfPsMetafile : public NativeMetafile {
 #endif  // if defined(OS_CHROMEOS)
 
  protected:
-  PdfPsMetafile();
+  PdfMetafileCairo();
 
  private:
   friend class NativeMetafileFactory;
-  FRIEND_TEST_ALL_PREFIXES(PdfPsTest, Pdf);
+  FRIEND_TEST_ALL_PREFIXES(PdfMetafileCairoTest, Pdf);
 
   // Cleans up all resources.
   void CleanUpAll();
@@ -84,9 +84,9 @@ class PdfPsMetafile : public NativeMetafile {
   // initialized (Init() vs InitFromData()).
   std::string* current_data_;
 
-  DISALLOW_COPY_AND_ASSIGN(PdfPsMetafile);
+  DISALLOW_COPY_AND_ASSIGN(PdfMetafileCairo);
 };
 
 }  // namespace printing
 
-#endif  // PRINTING_PDF_PS_METAFILE_CAIRO_H_
+#endif  // PRINTING_PDF_METAFILE_CAIRO_LINUX_H_
diff --git a/printing/pdf_ps_metafile_cairo_unittest.cc b/printing/pdf_metafile_cairo_linux_unittest.cc
index 5b2bf2a..c644a3d 100644
--- a/printing/pdf_ps_metafile_cairo_unittest.cc
+++ b/printing/pdf_metafile_cairo_linux_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "printing/pdf_ps_metafile_cairo.h"
+#include "printing/pdf_metafile_cairo_linux.h"
 
 #include <fcntl.h>
 #include <string>
@@ -20,15 +20,15 @@ typedef struct _cairo cairo_t;
 
 namespace {
 
-class PdfPsTest : public testing::Test {};
+class PdfMetafileCairoTest : public testing::Test {};
 
 }  // namespace
 
 namespace printing {
 
-TEST_F(PdfPsTest, Pdf) {
+TEST_F(PdfMetafileCairoTest, Pdf) {
   // Tests in-renderer constructor.
-  printing::PdfPsMetafile pdf;
+  printing::PdfMetafileCairo pdf;
   EXPECT_TRUE(pdf.Init());
 
   // Renders page 1.
@@ -53,7 +53,7 @@ TEST_F(PdfPsTest, Pdf) {
   pdf.GetData(&buffer.front(), size);
 
   // Tests another constructor.
-  printing::PdfPsMetafile pdf2;
+  printing::PdfMetafileCairo pdf2;
   EXPECT_TRUE(pdf2.InitFromData(&buffer.front(), size));
 
   // Tries to get the first 4 characters from pdf2.
@@ -68,7 +68,7 @@ TEST_F(PdfPsTest, Pdf) {
   EXPECT_TRUE(pdf.SaveTo(FilePath("/dev/null")));
 
   // Test overriding the metafile with raw data.
-  printing::PdfPsMetafile pdf3;
+  printing::PdfMetafileCairo pdf3;
   EXPECT_TRUE(pdf3.Init());
   EXPECT_TRUE(pdf3.StartPage(gfx::Size(72, 73), gfx::Point(4, 5), 1));
   std::string test_raw_data = "Dummy PDF";
diff --git a/printing/pdf_metafile_mac.cc b/printing/pdf_metafile_cg_mac.cc
index 913f6aa..f1b387a 100644
--- a/printing/pdf_metafile_mac.cc
+++ b/printing/pdf_metafile_cg_mac.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "printing/pdf_metafile_mac.h"
+#include "printing/pdf_metafile_cg_mac.h"
 
 #include "base/file_path.h"
 #include "base/logging.h"
@@ -15,13 +15,13 @@ using base::mac::ScopedCFTypeRef;
 
 namespace printing {
 
-PdfMetafile::PdfMetafile()
+PdfMetafileCg::PdfMetafileCg()
     : page_is_open_(false) {
 }
 
-PdfMetafile::~PdfMetafile() {}
+PdfMetafileCg::~PdfMetafileCg() {}
 
-bool PdfMetafile::Init() {
+bool PdfMetafileCg::Init() {
   // Ensure that Init hasn't already been called.
   DCHECK(!context_.get());
   DCHECK(!pdf_data_.get());
@@ -47,7 +47,8 @@ bool PdfMetafile::Init() {
   return true;
 }
 
-bool PdfMetafile::InitFromData(const void* src_buffer, uint32 src_buffer_size) {
+bool PdfMetafileCg::InitFromData(const void* src_buffer,
+                                 uint32 src_buffer_size) {
   DCHECK(!context_.get());
   DCHECK(!pdf_data_.get());
 
@@ -62,16 +63,16 @@ bool PdfMetafile::InitFromData(const void* src_buffer, uint32 src_buffer_size) {
   return true;
 }
 
-skia::PlatformDevice* PdfMetafile::StartPageForVectorCanvas(
+skia::PlatformDevice* PdfMetafileCg::StartPageForVectorCanvas(
     const gfx::Size& page_size, const gfx::Point& content_origin,
     const float& scale_factor) {
   NOTIMPLEMENTED();
   return NULL;
 }
 
-bool PdfMetafile::StartPage(const gfx::Size& page_size,
-                            const gfx::Point& content_origin,
-                            const float& scale_factor) {
+bool PdfMetafileCg::StartPage(const gfx::Size& page_size,
+                              const gfx::Point& content_origin,
+                              const float& scale_factor) {
   DCHECK(context_.get());
   DCHECK(!page_is_open_);
 
@@ -93,7 +94,7 @@ bool PdfMetafile::StartPage(const gfx::Size& page_size,
   return context_.get() != NULL;
 }
 
-bool PdfMetafile::FinishPage() {
+bool PdfMetafileCg::FinishPage() {
   DCHECK(context_.get());
   DCHECK(page_is_open_);
 
@@ -103,7 +104,7 @@ bool PdfMetafile::FinishPage() {
   return true;
 }
 
-bool PdfMetafile::FinishDocument() {
+bool PdfMetafileCg::FinishDocument() {
   DCHECK(context_.get());
   DCHECK(!page_is_open_);
 
@@ -123,11 +124,13 @@ bool PdfMetafile::FinishDocument() {
   return true;
 }
 
-bool PdfMetafile::RenderPage(unsigned int page_number, CGContextRef context,
-                             const CGRect rect, bool shrink_to_fit,
-                             bool stretch_to_fit,
-                             bool center_horizontally,
-                             bool center_vertically) const {
+bool PdfMetafileCg::RenderPage(unsigned int page_number,
+                               CGContextRef context,
+                               const CGRect rect,
+                               bool shrink_to_fit,
+                               bool stretch_to_fit,
+                               bool center_horizontally,
+                               bool center_vertically) const {
   CGPDFDocumentRef pdf_doc = GetPDFDocument();
   if (!pdf_doc) {
     LOG(ERROR) << "Unable to create PDF document from data";
@@ -175,12 +178,12 @@ bool PdfMetafile::RenderPage(unsigned int page_number, CGContextRef context,
   return true;
 }
 
-unsigned int PdfMetafile::GetPageCount() const {
+unsigned int PdfMetafileCg::GetPageCount() const {
   CGPDFDocumentRef pdf_doc = GetPDFDocument();
   return pdf_doc ? CGPDFDocumentGetNumberOfPages(pdf_doc) : 0;
 }
 
-gfx::Rect PdfMetafile::GetPageBounds(unsigned int page_number) const {
+gfx::Rect PdfMetafileCg::GetPageBounds(unsigned int page_number) const {
   CGPDFDocumentRef pdf_doc = GetPDFDocument();
   if (!pdf_doc) {
     LOG(ERROR) << "Unable to create PDF document from data";
@@ -195,7 +198,7 @@ gfx::Rect PdfMetafile::GetPageBounds(unsigned int page_number) const {
   return gfx::Rect(page_rect);
 }
 
-uint32 PdfMetafile::GetDataSize() const {
+uint32 PdfMetafileCg::GetDataSize() const {
   // PDF data is only valid/complete once the context is released.
   DCHECK(!context_);
 
@@ -204,7 +207,7 @@ uint32 PdfMetafile::GetDataSize() const {
   return static_cast<uint32>(CFDataGetLength(pdf_data_));
 }
 
-bool PdfMetafile::GetData(void* dst_buffer, uint32 dst_buffer_size) const {
+bool PdfMetafileCg::GetData(void* dst_buffer, uint32 dst_buffer_size) const {
   // PDF data is only valid/complete once the context is released.
   DCHECK(!context_);
   DCHECK(pdf_data_);
@@ -221,7 +224,7 @@ bool PdfMetafile::GetData(void* dst_buffer, uint32 dst_buffer_size) const {
   return true;
 }
 
-bool PdfMetafile::SaveTo(const FilePath& file_path) const {
+bool PdfMetafileCg::SaveTo(const FilePath& file_path) const {
   DCHECK(pdf_data_.get());
   DCHECK(!context_.get());
 
@@ -234,11 +237,11 @@ bool PdfMetafile::SaveTo(const FilePath& file_path) const {
   return error_code == 0;
 }
 
-CGContextRef PdfMetafile::context() const {
+CGContextRef PdfMetafileCg::context() const {
   return context_.get();
 }
 
-CGPDFDocumentRef PdfMetafile::GetPDFDocument() const {
+CGPDFDocumentRef PdfMetafileCg::GetPDFDocument() const {
   // Make sure that we have data, and that it's not being modified any more.
   DCHECK(pdf_data_.get());
   DCHECK(!context_.get());
diff --git a/printing/pdf_metafile_mac.h b/printing/pdf_metafile_cg_mac.h
index 496b275..0183246 100644
--- a/printing/pdf_metafile_mac.h
+++ b/printing/pdf_metafile_cg_mac.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PRINTING_PDF_METAFILE_MAC_H_
-#define PRINTING_PDF_METAFILE_MAC_H_
+#ifndef PRINTING_PDF_METAFILE_CG_MAC_H_
+#define PRINTING_PDF_METAFILE_CG_MAC_H_
 
 #include <ApplicationServices/ApplicationServices.h>
 #include <CoreFoundation/CoreFoundation.h>
@@ -24,10 +24,10 @@ class Point;
 namespace printing {
 
 // This class creates a graphics context that renders into a PDF data stream.
-class PdfMetafile : public NativeMetafile {
+class PdfMetafileCg : public NativeMetafile {
  public:
 
-  virtual ~PdfMetafile();
+  virtual ~PdfMetafileCg();
 
   // NativeMetafile methods.
   virtual bool Init();
@@ -65,11 +65,11 @@ class PdfMetafile : public NativeMetafile {
                           bool center_vertically) const;
 
  protected:
-  PdfMetafile();
+  PdfMetafileCg();
 
  private:
   friend class NativeMetafileFactory;
-  FRIEND_TEST_ALL_PREFIXES(PdfMetafileTest, Pdf);
+  FRIEND_TEST_ALL_PREFIXES(PdfMetafileCgTest, Pdf);
 
   // Returns a CGPDFDocumentRef version of pdf_data_.
   CGPDFDocumentRef GetPDFDocument() const;
@@ -86,9 +86,9 @@ class PdfMetafile : public NativeMetafile {
   // Whether or not a page is currently open.
   bool page_is_open_;
 
-  DISALLOW_COPY_AND_ASSIGN(PdfMetafile);
+  DISALLOW_COPY_AND_ASSIGN(PdfMetafileCg);
 };
 
 }  // namespace printing
 
-#endif  // PRINTING_PDF_METAFILE_MAC_H_
+#endif  // PRINTING_PDF_METAFILE_CG_MAC_H_
diff --git a/printing/pdf_metafile_mac_unittest.cc b/printing/pdf_metafile_cg_mac_unittest.cc
index b237978..5324514 100644
--- a/printing/pdf_metafile_mac_unittest.cc
+++ b/printing/pdf_metafile_cg_mac_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "printing/pdf_metafile_mac.h"
+#include "printing/pdf_metafile_cg_mac.h"
 
 #import <ApplicationServices/ApplicationServices.h>
 
@@ -14,9 +14,9 @@
 
 namespace printing {
 
-TEST(PdfMetafileTest, Pdf) {
+TEST(PdfMetafileCgTest, Pdf) {
   // Test in-renderer constructor.
-  printing::PdfMetafile pdf;
+  printing::PdfMetafileCg pdf;
   EXPECT_TRUE(pdf.Init());
   EXPECT_TRUE(pdf.context() != NULL);
 
@@ -43,7 +43,7 @@ TEST(PdfMetafileTest, Pdf) {
   pdf.GetData(&buffer.front(), size);
 
   // Test browser-side constructor.
-  printing::PdfMetafile pdf2;
+  printing::PdfMetafileCg pdf2;
   EXPECT_TRUE(pdf2.InitFromData(&buffer.front(), size));
 
   // Get the first 4 characters from pdf2.
diff --git a/printing/print_settings_initializer_gtk.cc b/printing/print_settings_initializer_gtk.cc
index 833db52..a42561ba 100644
--- a/printing/print_settings_initializer_gtk.cc
+++ b/printing/print_settings_initializer_gtk.cc
@@ -9,7 +9,6 @@
 
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
-#include "printing/pdf_ps_metafile_cairo.h"
 #include "printing/print_settings.h"
 #include "printing/units.h"
 
diff --git a/printing/printing.gyp b/printing/printing.gyp
index 94c90a6..ae61a41 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -47,10 +47,10 @@
         'page_range.h',
         'page_setup.cc',
         'page_setup.h',
-        'pdf_metafile_mac.cc',
-        'pdf_metafile_mac.h',
-        'pdf_ps_metafile_cairo.cc',
-        'pdf_ps_metafile_cairo.h',
+        'pdf_metafile_cairo_linux.cc',
+        'pdf_metafile_cairo_linux.h',
+        'pdf_metafile_cg_mac.cc',
+        'pdf_metafile_cg_mac.h',
         'printed_document_cairo.cc',
         'printed_document.cc',
         'printed_document.h',
@@ -165,8 +165,8 @@
         'page_overlays_unittest.cc',
         'page_range_unittest.cc',
         'page_setup_unittest.cc',
-        'pdf_metafile_mac_unittest.cc',
-        'pdf_ps_metafile_cairo_unittest.cc',
+        'pdf_metafile_cairo_linux_unittest.cc',
+        'pdf_metafile_cg_mac_unittest.cc',
         'printed_page_unittest.cc',
         'printing_context_win_unittest.cc',
         'run_all_unittests.cc',