| Index: third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp
|
| diff --git a/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp b/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp
|
| index 84f740fc03ff7327967632e6f58fb297406c20b3..04d54668f4e8fbb64593d7812d07eeb877758993 100644
|
| --- a/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp
|
| +++ b/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp
|
| @@ -37,10 +37,10 @@
|
| #include "url/url_canon_ip.h"
|
| #include "wtf/HexNumber.h"
|
| #include "wtf/NotFound.h"
|
| -#include "wtf/OwnPtr.h"
|
| -#include "wtf/PassOwnPtr.h"
|
| +#include "wtf/PtrUtil.h"
|
| #include "wtf/StdLibExtras.h"
|
| #include "wtf/text/StringBuilder.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -559,16 +559,16 @@ const KURL& SecurityOrigin::urlWithUniqueSecurityOrigin()
|
| return uniqueSecurityOriginURL;
|
| }
|
|
|
| -PassOwnPtr<SecurityOrigin::PrivilegeData> SecurityOrigin::createPrivilegeData() const
|
| +std::unique_ptr<SecurityOrigin::PrivilegeData> SecurityOrigin::createPrivilegeData() const
|
| {
|
| - OwnPtr<PrivilegeData> privilegeData = adoptPtr(new PrivilegeData);
|
| + std::unique_ptr<PrivilegeData> privilegeData = wrapUnique(new PrivilegeData);
|
| privilegeData->m_universalAccess = m_universalAccess;
|
| privilegeData->m_canLoadLocalResources = m_canLoadLocalResources;
|
| privilegeData->m_blockLocalAccessFromLocalOrigin = m_blockLocalAccessFromLocalOrigin;
|
| return privilegeData;
|
| }
|
|
|
| -void SecurityOrigin::transferPrivilegesFrom(PassOwnPtr<PrivilegeData> privilegeData)
|
| +void SecurityOrigin::transferPrivilegesFrom(std::unique_ptr<PrivilegeData> privilegeData)
|
| {
|
| m_universalAccess = privilegeData->m_universalAccess;
|
| m_canLoadLocalResources = privilegeData->m_canLoadLocalResources;
|
|
|