Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/weborigin/KURL.cpp

 /*
  * Copyright (C) 2004, 2007, 2008, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2012 Research In Motion Limited. All rights reserved.
  * Copyright (C) 2008, 2009, 2011 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 11 matching lines @@
  * 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/weborigin/KURL.h"
 
 #include "platform/weborigin/KnownPorts.h"
 #include "url/url_util.h"
-#include "wtf/PtrUtil.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/StringHash.h"
 #include "wtf/text/StringUTF8Adaptor.h"
 #include "wtf/text/TextEncoding.h"
 #include <algorithm>
 #ifndef NDEBUG
 #include <stdio.h>
 #endif
 
@@ skipping 225 matching lines @@
 {
 }
 
 KURL::KURL(const KURL& other)
     : m_isValid(other.m_isValid)
     , m_protocolIsInHTTPFamily(other.m_protocolIsInHTTPFamily)
     , m_parsed(other.m_parsed)
     , m_string(other.m_string)
 {
     if (other.m_innerURL.get())
-        m_innerURL = wrapUnique(new KURL(other.m_innerURL->copy()));
+        m_innerURL = adoptPtr(new KURL(other.m_innerURL->copy()));
 }
 
 KURL::~KURL()
 {
 }
 
 KURL& KURL::operator=(const KURL& other)
 {
     m_isValid = other.m_isValid;
     m_protocolIsInHTTPFamily = other.m_protocolIsInHTTPFamily;
     m_parsed = other.m_parsed;
     m_string = other.m_string;
     if (other.m_innerURL)
-        m_innerURL = wrapUnique(new KURL(other.m_innerURL->copy()));
+        m_innerURL = adoptPtr(new KURL(other.m_innerURL->copy()));
     else
         m_innerURL.reset();
     return *this;
 }
 
 KURL KURL::copy() const
 {
     KURL result;
     result.m_isValid = m_isValid;
     result.m_protocolIsInHTTPFamily = m_protocolIsInHTTPFamily;
     result.m_parsed = m_parsed;
     result.m_string = m_string.isolatedCopy();
     if (m_innerURL)
-        result.m_innerURL = wrapUnique(new KURL(m_innerURL->copy()));
+        result.m_innerURL = adoptPtr(new KURL(m_innerURL->copy()));
     return result;
 }
 
 bool KURL::isNull() const
 {
     return m_string.isNull();
 }
 
 bool KURL::isEmpty() const
 {
@@ skipping 495 matching lines @@
     m_string = AtomicString::fromUTF8(output.data(), output.length());
 }
 
 void KURL::initInnerURL()
 {
     if (!m_isValid) {
         m_innerURL.reset();
         return;
     }
     if (url::Parsed* innerParsed = m_parsed.inner_parsed())
-        m_innerURL = wrapUnique(new KURL(ParsedURLString, m_string.substring(innerParsed->scheme.begin, innerParsed->Length() - innerParsed->scheme.begin)));
+        m_innerURL = adoptPtr(new KURL(ParsedURLString, m_string.substring(innerParsed->scheme.begin, innerParsed->Length() - innerParsed->scheme.begin)));
     else
         m_innerURL.reset();
 }
 
 template<typename CHAR>
 bool internalProtocolIs(const url::Component& scheme, const CHAR* spec, const char* protocol)
 {
     const CHAR* begin = spec + scheme.begin;
     const CHAR* end = begin + scheme.len;
 
@@ skipping 82 matching lines @@
     m_string = AtomicString::fromUTF8(output.data(), output.length());
 }
 
 bool KURL::isSafeToSendToAnotherThread() const
 {
     return m_string.isSafeToSendToAnotherThread()
         && (!m_innerURL || m_innerURL->isSafeToSendToAnotherThread());
 }
 
 } // namespace blink