| Index: third_party/WebKit/Source/platform/network/ResourceTimingInfo.cpp
|
| diff --git a/third_party/WebKit/Source/platform/network/ResourceTimingInfo.cpp b/third_party/WebKit/Source/platform/network/ResourceTimingInfo.cpp
|
| index 03d02971ef685fc434935a7dbf71326a0b2fc4a7..064cc455f53795a771dfdc95e4f23990251388f5 100644
|
| --- a/third_party/WebKit/Source/platform/network/ResourceTimingInfo.cpp
|
| +++ b/third_party/WebKit/Source/platform/network/ResourceTimingInfo.cpp
|
| @@ -5,12 +5,14 @@
|
| #include "platform/network/ResourceTimingInfo.h"
|
|
|
| #include "platform/CrossThreadCopier.h"
|
| +#include "wtf/PtrUtil.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| -PassOwnPtr<ResourceTimingInfo> ResourceTimingInfo::adopt(PassOwnPtr<CrossThreadResourceTimingInfoData> data)
|
| +std::unique_ptr<ResourceTimingInfo> ResourceTimingInfo::adopt(std::unique_ptr<CrossThreadResourceTimingInfoData> data)
|
| {
|
| - OwnPtr<ResourceTimingInfo> info = ResourceTimingInfo::create(AtomicString(data->m_type), data->m_initialTime, data->m_isMainResource);
|
| + std::unique_ptr<ResourceTimingInfo> info = ResourceTimingInfo::create(AtomicString(data->m_type), data->m_initialTime, data->m_isMainResource);
|
| info->m_originalTimingAllowOrigin = AtomicString(data->m_originalTimingAllowOrigin);
|
| info->m_loadFinishTime = data->m_loadFinishTime;
|
| info->m_initialRequest = ResourceRequest(data->m_initialRequest.get());
|
| @@ -20,9 +22,9 @@ PassOwnPtr<ResourceTimingInfo> ResourceTimingInfo::adopt(PassOwnPtr<CrossThreadR
|
| return info;
|
| }
|
|
|
| -PassOwnPtr<CrossThreadResourceTimingInfoData> ResourceTimingInfo::copyData() const
|
| +std::unique_ptr<CrossThreadResourceTimingInfoData> ResourceTimingInfo::copyData() const
|
| {
|
| - OwnPtr<CrossThreadResourceTimingInfoData> data = adoptPtr(new CrossThreadResourceTimingInfoData);
|
| + std::unique_ptr<CrossThreadResourceTimingInfoData> data = wrapUnique(new CrossThreadResourceTimingInfoData);
|
| data->m_type = m_type.getString().isolatedCopy();
|
| data->m_originalTimingAllowOrigin = m_originalTimingAllowOrigin.getString().isolatedCopy();
|
| data->m_initialTime = m_initialTime;
|
|
|