Adding CreateFromData to NativeMetafileFactory

chrome/renderer/mock_printer.cc

 // Copyright (c) 2011 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/print_messages.h"
 #include "ipc/ipc_message_utils.h"
@@ skipping 120 matching lines @@
   // 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::Create());
-  metafile->InitFromData(metafile_data.memory(), params.data_size);
+      printing::NativeMetafileFactory::CreateFromData(metafile_data.memory(),
+                                                      params.data_size));
+  if (!metafile.get())

[vandebo (ex-Chrome), 2011/03/24 20:11:55]

This one, we probably want to CHECK(metafile.get())

[dpapad, 2011/03/24 21:08:14]

Done.

+    return;
   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);
@@ skipping 56 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_;
 }