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

printing/image.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 "printing/image.h"
 
 #include "base/file_util.h"
 #include "base/md5.h"
-#include "base/scoped_ptr.h"
 #include "base/string_number_conversions.h"
-#include "printing/native_metafile_factory.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/codec/png_codec.h"
 
 namespace printing {
 
 Image::Image(const FilePath& path)
     : row_length_(0),
       ignore_alpha_(true) {
   std::string data;
   file_util::ReadFileToString(path, &data);
@@ skipping 117 matching lines @@
   bool success = gfx::PNGCodec::Decode(
       reinterpret_cast<const unsigned char*>(compressed.c_str()),
       compressed.size(), gfx::PNGCodec::FORMAT_BGRA, &data_, &w, &h);
   size_.SetSize(w, h);
   row_length_ = size_.width() * sizeof(uint32);
   return success;
 }
 
 bool Image::LoadMetafile(const std::string& data) {
   DCHECK(!data.empty());
-  scoped_ptr<NativeMetafile> metafile(
-      printing::NativeMetafileFactory::CreateMetafile());
-  metafile->Init(data.data(), data.size());
-  return LoadMetafile(*metafile);
+  NativeMetafile metafile;
+  metafile.Init(data.data(), data.size());
+  return LoadMetafile(metafile);
 }
 
 }  // namespace printing