Revert 76553 - Applying factory pattern (through NativeMetafileFactory class)...

chrome/renderer/mock_printer.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/mock_printer.h"
 
 #include "base/file_util.h"
 #include "base/shared_memory.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
 #include "ipc/ipc_message_utils.h"
-#include "printing/native_metafile_factory.h"
-#include "printing/native_metafile.h"
 #include "printing/units.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 MockPrinterPage::MockPrinterPage(const void* source_data,
                                  uint32 source_size,
                                  const printing::Image& image)
     : source_size_(source_size),
       image_(image) {
   // Create copies of the source data
   source_data_.reset(new uint8[source_size]);
@@ skipping 102 matching lines @@
   // We duplicate the given file handle when creating a base::SharedMemory
   // instance so that its destructor closes the copy.
   EXPECT_GT(params.data_size, 0U);
 #if defined(OS_WIN)
   base::SharedMemory metafile_data(params.metafile_data_handle, true,
                                    GetCurrentProcess());
 #elif defined(OS_MACOSX)
   base::SharedMemory metafile_data(params.metafile_data_handle, true);
 #endif
   metafile_data.Map(params.data_size);
-  scoped_ptr<printing::NativeMetafile> metafile(
-      printing::NativeMetafileFactory::CreateMetafile());
-  metafile->Init(metafile_data.memory(), params.data_size);
-  printing::Image image(*metafile);
+  printing::NativeMetafile metafile;
+  metafile.Init(metafile_data.memory(), params.data_size);
+  printing::Image image(metafile);
   MockPrinterPage* page_data = new MockPrinterPage(metafile_data.memory(),
                                                    params.data_size,
                                                    image);
   if (!page_data) {
     printer_status_ = PRINTER_ERROR;
     return;
   }
 
   scoped_refptr<MockPrinterPage> page(page_data);
   pages_.push_back(page);
@@ skipping 55 matching lines @@
   if (printer_status_ != PRINTER_READY || page >= pages_.size())
     return false;
 
   pages_[page]->image().SaveToPng(filepath);
   return true;
 }
 
 int MockPrinter::CreateDocumentCookie() {
   return ++current_document_cookie_;
 }