Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/core/loader/TextResourceDecoderBuilder.cpp

 /*
  * Copyright (C) 2013 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 16 matching lines @@
  * (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 "core/loader/TextResourceDecoderBuilder.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "platform/weborigin/SecurityOrigin.h"
-#include <memory>
 
 namespace blink {
 
 static inline bool canReferToParentFrameEncoding(const LocalFrame* frame, const LocalFrame* parentFrame)
 {
     return parentFrame && parentFrame->document()->getSecurityOrigin()->canAccess(frame->document()->getSecurityOrigin());
 }
 
 namespace {
 
@@ skipping 74 matching lines @@
     : m_mimeType(mimeType)
     , m_encoding(encoding)
 {
 }
 
 TextResourceDecoderBuilder::~TextResourceDecoderBuilder()
 {
 }
 
 
-inline std::unique_ptr<TextResourceDecoder> TextResourceDecoderBuilder::createDecoderInstance(Document* document)
+inline PassOwnPtr<TextResourceDecoder> TextResourceDecoderBuilder::createDecoderInstance(Document* document)
 {
     const WTF::TextEncoding encodingFromDomain = getEncodingFromDomain(document->url());
     if (LocalFrame* frame = document->frame()) {
         if (Settings* settings = frame->settings())
             return TextResourceDecoder::create(m_mimeType, encodingFromDomain.isValid() ? encodingFromDomain : settings->defaultTextEncodingName(), settings->usesEncodingDetector());
     }
 
     return TextResourceDecoder::create(m_mimeType, encodingFromDomain);
 }
 
@@ skipping 18 matching lines @@
     // we may consider relaxing this later after testing.
     if (frame && canReferToParentFrameEncoding(frame, parentFrame)) {
         if (parentFrame->document()->encodingWasDetectedHeuristically())
             decoder->setHintEncoding(parentFrame->document()->encoding());
 
         if (m_encoding.isEmpty())
             decoder->setEncoding(parentFrame->document()->encoding(), TextResourceDecoder::EncodingFromParentFrame);
     }
 }
 
-std::unique_ptr<TextResourceDecoder> TextResourceDecoderBuilder::buildFor(Document* document)
+PassOwnPtr<TextResourceDecoder> TextResourceDecoderBuilder::buildFor(Document* document)
 {
-    std::unique_ptr<TextResourceDecoder> decoder = createDecoderInstance(document);
+    OwnPtr<TextResourceDecoder> decoder = createDecoderInstance(document);
     setupEncoding(decoder.get(), document);
     return decoder;
 }
 
 void TextResourceDecoderBuilder::clear()
 {
     m_encoding = nullAtom;
 }
 
 } // namespace blink