Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp

 /*
  * Copyright (C) 2006 Apple Computer, Inc.
  *
  * Portions are Copyright (C) 2001-6 mozilla.org
  *
  * Other contributors:
  *   Stuart Parmenter <stuart@mozilla.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ skipping 21 matching lines @@
  * deletingthe provisions above and replace them with the notice and
  * other provisions required by the MPL or the GPL, as the case may be.
  * If you do not delete the provisions above, a recipient may use your
  * version of this file under any of the LGPL, the MPL or the GPL.
  */
 
 #include "platform/image-decoders/jpeg/JPEGImageDecoder.h"
 
 #include "platform/Histogram.h"
 #include "platform/PlatformInstrumentation.h"
-#include "wtf/PtrUtil.h"
 #include "wtf/Threading.h"
-#include <memory>
 
 extern "C" {
 #include <stdio.h> // jpeglib.h needs stdio FILE.
 #include "jpeglib.h"
 #if USE(ICCJPEG)
 #include "iccjpeg.h"
 #endif
 #if USE(QCMSLIB)
 #include "qcms.h"
 #endif
@@ skipping 733 matching lines @@
 {
     if (!hasImagePlanes())
         return false;
 
     PlatformInstrumentation::willDecodeImage("JPEG");
     decode(false);
     PlatformInstrumentation::didDecodeImage();
     return !failed();
 }
 
-void JPEGImageDecoder::setImagePlanes(std::unique_ptr<ImagePlanes> imagePlanes)
+void JPEGImageDecoder::setImagePlanes(PassOwnPtr<ImagePlanes> imagePlanes)
 {
     m_imagePlanes = std::move(imagePlanes);
 }
 
 template <J_COLOR_SPACE colorSpace> void setPixel(ImageFrame& buffer, ImageFrame::PixelData* pixel, JSAMPARRAY samples, int column)
 {
     ASSERT_NOT_REACHED();
 }
 
 template <> void setPixel<JCS_RGB>(ImageFrame& buffer, ImageFrame::PixelData* pixel, JSAMPARRAY samples, int column)
@@ skipping 174 matching lines @@
 
     return decoder->frameIsCompleteAtIndex(0);
 }
 
 void JPEGImageDecoder::decode(bool onlySize)
 {
     if (failed())
         return;
 
     if (!m_reader) {
-        m_reader = wrapUnique(new JPEGImageReader(this));
+        m_reader = adoptPtr(new JPEGImageReader(this));
         m_reader->setData(m_data.get());
     }
 
     // If we couldn't decode the image but have received all the data, decoding
     // has failed.
     if (!m_reader->decode(onlySize) && isAllDataReceived())
         setFailed();
 
     // If decoding is done or failed, we don't need the JPEGImageReader anymore.
     if (isComplete(this, onlySize) || failed())
         m_reader.reset();
 }
 
 } // namespace blink