Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/core/fileapi/FileReaderLoader.cpp

 /*
  * Copyright (C) 2010 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 25 matching lines @@
 #include "core/fileapi/Blob.h"
 #include "core/fileapi/FileReaderLoaderClient.h"
 #include "core/html/parser/TextResourceDecoder.h"
 #include "core/loader/ThreadableLoader.h"
 #include "core/streams/Stream.h"
 #include "platform/blob/BlobRegistry.h"
 #include "platform/blob/BlobURL.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/network/ResourceResponse.h"
 #include "public/platform/WebURLRequest.h"
+#include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
-#include "wtf/PtrUtil.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 #include "wtf/text/Base64.h"
 #include "wtf/text/StringBuilder.h"
-#include <memory>
 
 namespace blink {
 
 FileReaderLoader::FileReaderLoader(ReadType readType, FileReaderLoaderClient* client)
     : m_readType(readType)
     , m_client(client)
     , m_urlForReadingIsStream(false)
     , m_isRawDataConverted(false)
     , m_stringResult("")
     , m_finishedLoading(false)
@@ skipping 104 matching lines @@
 
     // If we get any error, we do not need to keep a buffer around.
     if (m_errorCode) {
         m_rawData.reset();
         m_stringResult = "";
         m_isRawDataConverted = true;
         m_decoder.reset();
     }
 }
 
-void FileReaderLoader::didReceiveResponse(unsigned long, const ResourceResponse& response, std::unique_ptr<WebDataConsumerHandle> handle)
+void FileReaderLoader::didReceiveResponse(unsigned long, const ResourceResponse& response, PassOwnPtr<WebDataConsumerHandle> handle)
 {
     ASSERT_UNUSED(handle, !handle);
     if (response.httpStatusCode() != 200) {
         failed(httpStatusCodeToErrorCode(response.httpStatusCode()));
         return;
     }
 
     // A negative value means that the content length wasn't specified.
     m_totalBytes = response.expectedContentLength();
 
@@ skipping 17 matching lines @@
     if (m_readType != ReadByClient) {
         // Check that we can cast to unsigned since we have to do
         // so to call ArrayBuffer's create function.
         // FIXME: Support reading more than the current size limit of ArrayBuffer.
         if (initialBufferLength > std::numeric_limits<unsigned>::max()) {
             failed(FileError::NOT_READABLE_ERR);
             return;
         }
 
         if (initialBufferLength < 0)
-            m_rawData = wrapUnique(new ArrayBufferBuilder());
+            m_rawData = adoptPtr(new ArrayBufferBuilder());
         else
-            m_rawData = wrapUnique(new ArrayBufferBuilder(static_cast<unsigned>(initialBufferLength)));
+            m_rawData = adoptPtr(new ArrayBufferBuilder(static_cast<unsigned>(initialBufferLength)));
 
         if (!m_rawData || !m_rawData->isValid()) {
             failed(FileError::NOT_READABLE_ERR);
             return;
         }
 
         if (initialBufferLength >= 0) {
             // Total size is known. Set m_rawData to ignore overflowed data.
             m_rawData->setVariableCapacity(false);
         }
@@ skipping 175 matching lines @@
     m_stringResult = builder.toString();
 }
 
 void FileReaderLoader::setEncoding(const String& encoding)
 {
     if (!encoding.isEmpty())
         m_encoding = WTF::TextEncoding(encoding);
 }
 
 } // namespace blink