Connect the right metafiles for print preview on Linux and Windows.

printing/metafile_skia_wrapper.cc

Index: printing/metafile_skia_wrapper.cc
diff --git a/printing/native_metafile_skia_wrapper.cc b/printing/metafile_skia_wrapper.cc
similarity index 53%
rename from printing/native_metafile_skia_wrapper.cc
rename to printing/metafile_skia_wrapper.cc
index 38de9dfde49e36483e70a4c4eb58c5ebe2fa5af0..22b58c87277db47c5f70d9785ff5e57006bb2a4e 100644
--- a/printing/native_metafile_skia_wrapper.cc
+++ b/printing/metafile_skia_wrapper.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/logging.h"
-#include "printing/native_metafile_skia_wrapper.h"
+#include "printing/metafile_skia_wrapper.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "third_party/skia/include/core/SkMetaData.h"
@@ -12,7 +12,7 @@ namespace printing {
 
 namespace {
 
-static const char* kNativeMetafileKey = "CrNativeMetafile";
+static const char* kMetafileKey = "CrMetafile";
 
 SkMetaData& getMetaData(SkCanvas* canvas) {
   DCHECK(canvas != NULL);
@@ -24,31 +24,29 @@ SkMetaData& getMetaData(SkCanvas* canvas) {
 
 }  // namespace
 
-
 // static
-void NativeMetafileSkiaWrapper::SetMetafileOnCanvas(SkCanvas* canvas,
-                                                    NativeMetafile* metafile) {
-  NativeMetafileSkiaWrapper* wrapper = NULL;
+void MetafileSkiaWrapper::SetMetafileOnCanvas(SkCanvas* canvas,
+                                              Metafile* metafile) {
+  MetafileSkiaWrapper* wrapper = NULL;
   if (metafile)
-    wrapper = new NativeMetafileSkiaWrapper(metafile);
+    wrapper = new MetafileSkiaWrapper(metafile);
 
   SkMetaData& meta = getMetaData(canvas);
-  meta.setRefCnt(kNativeMetafileKey, wrapper);
+  meta.setRefCnt(kMetafileKey, wrapper);
   SkSafeUnref(wrapper);
 }
 
 // static
-NativeMetafile* NativeMetafileSkiaWrapper::GetMetafileFromCanvas(
-    SkCanvas* canvas) {
+Metafile* MetafileSkiaWrapper::GetMetafileFromCanvas(SkCanvas* canvas) {
   SkMetaData& meta = getMetaData(canvas);
   SkRefCnt* value;
-  if (!meta.findRefCnt(kNativeMetafileKey, &value) || !value)
+  if (!meta.findRefCnt(kMetafileKey, &value) || !value)
     return NULL;
 
-  return static_cast<NativeMetafileSkiaWrapper*>(value)->metafile_;
+  return static_cast<MetafileSkiaWrapper*>(value)->metafile_;
 }
 
-NativeMetafileSkiaWrapper::NativeMetafileSkiaWrapper(NativeMetafile* metafile)
+MetafileSkiaWrapper::MetafileSkiaWrapper(Metafile* metafile)
     : metafile_(metafile) {
 }