Index: third_party/WebKit/Source/platform/weborigin/KURL.cpp |
diff --git a/third_party/WebKit/Source/platform/weborigin/KURL.cpp b/third_party/WebKit/Source/platform/weborigin/KURL.cpp |
index b191958f75a3b25752a9ab0039d5bcb84832cfe9..d8b32348d5118f0a884357d8f441ec55a1abf7c6 100644 |
--- a/third_party/WebKit/Source/platform/weborigin/KURL.cpp |
+++ b/third_party/WebKit/Source/platform/weborigin/KURL.cpp |
@@ -29,7 +29,6 @@ |
#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" |
@@ -275,7 +274,7 @@ KURL::KURL(const KURL& other) |
, 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() |
@@ -289,7 +288,7 @@ KURL& KURL::operator=(const KURL& other) |
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; |
@@ -303,7 +302,7 @@ KURL KURL::copy() const |
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; |
} |
@@ -819,7 +818,7 @@ void KURL::initInnerURL() |
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(); |
} |