Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageDecoder.cpp

 /*
  * Copyright (c) 2008, 2009, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "platform/image-decoders/bmp/BMPImageDecoder.h"
 
 #include "platform/image-decoders/FastSharedBufferReader.h"
-#include "wtf/PtrUtil.h"
+#include "wtf/PassOwnPtr.h"
 
 namespace blink {
 
 // Number of bits in .BMP used to store the file header (doesn't match
 // "sizeof(BMPImageDecoder::BitmapFileHeader)" since we omit some fields and
 // don't pack).
 static const size_t sizeOfFileHeader = 14;
 
 BMPImageDecoder::BMPImageDecoder(AlphaOption alphaOption, GammaAndColorProfileOption colorOptions, size_t maxDecodedBytes)
     : ImageDecoder(alphaOption, colorOptions, maxDecodedBytes)
@@ skipping 28 matching lines @@
         m_reader.reset();
 }
 
 bool BMPImageDecoder::decodeHelper(bool onlySize)
 {
     size_t imgDataOffset = 0;
     if ((m_decodedOffset < sizeOfFileHeader) && !processFileHeader(imgDataOffset))
         return false;
 
     if (!m_reader) {
-        m_reader = wrapUnique(new BMPImageReader(this, m_decodedOffset, imgDataOffset, false));
+        m_reader = adoptPtr(new BMPImageReader(this, m_decodedOffset, imgDataOffset, false));
         m_reader->setData(m_data.get());
     }
 
     if (!m_frameBufferCache.isEmpty())
         m_reader->setBuffer(&m_frameBufferCache.first());
 
     return m_reader->decodeBMP(onlySize);
 }
 
 bool BMPImageDecoder::processFileHeader(size_t& imgDataOffset)
@@ skipping 21 matching lines @@
         POINTER = 0x5054,  // "PT"
         COLORICON = 0x4349,  // "CI"
         COLORPOINTER = 0x4350,  // "CP"
         BITMAPARRAY = 0x4241,  // "BA"
         */
     };
     return (fileType == BMAP) || setFailed();
 }
 
 } // namespace blink