Cleanup NativeMetafile (win) interface and EMF class.

printing/emf_win.h

Index: printing/emf_win.h
diff --git a/printing/emf_win.h b/printing/emf_win.h
index f2ccffd1235540fa165734e0e6b77f0aca031007..f4ee30f16af0536dd52c7e1f6caa070f2d1c26eb 100644
--- a/printing/emf_win.h
+++ b/printing/emf_win.h
@@ -29,10 +29,20 @@ class Emf : public NativeMetafile {
   class Enumerator;
   struct EnumerationContext;
 
+  // Generates a virtual HDC that will record every GDI commands and compile
+  // it in a EMF data stream.
+  Emf();
   virtual ~Emf();
 
+  // Generates a new metafile that will record every GDI command, and will
+  // be saved to |metafile_path|.
+  virtual bool InitToFile(const FilePath& metafile_path);
+
+  // Initializes the Emf with the data in |metafile_path|.
+  virtual bool InitFromFile(const FilePath& metafile_path);
+
   // NativeMetafile methods.
-  virtual bool Init() { return true; }
+  virtual bool Init();
   virtual bool InitFromData(const void* src_buffer, uint32 src_buffer_size);
 
   virtual skia::PlatformDevice* StartPageForVectorCanvas(
@@ -68,14 +78,6 @@ class Emf : public NativeMetafile {
     return hdc_;
   }
 
-  virtual bool CreateDc(HDC sibling, const RECT* rect);
-  virtual bool CreateFileBackedDc(HDC sibling,
-                                  const RECT* rect,
-                                  const FilePath& path);
-  virtual bool CreateFromFile(const FilePath& file_path);
-
-  virtual void CloseEmf();
-
   virtual bool Playback(HDC hdc, const RECT* rect) const;
   virtual bool SafePlayback(HDC hdc) const;
 
@@ -85,16 +87,7 @@ class Emf : public NativeMetafile {
     return emf_;
   }
 
- protected:
-  Emf();
-
  private:
-  friend class NativeMetafileFactory;
-  FRIEND_TEST_ALL_PREFIXES(EmfTest, DC);
-  FRIEND_TEST_ALL_PREFIXES(EmfTest, FileBackedDC);
-  FRIEND_TEST_ALL_PREFIXES(EmfPrintingTest, Enumerate);
-  FRIEND_TEST_ALL_PREFIXES(EmfPrintingTest, PageBreak);
-
   // Playbacks safely one EMF record.
   static int CALLBACK SafePlaybackProc(HDC hdc,
                                        HANDLETABLE* handle_table,