Index: third_party/WebKit/Source/core/fetch/Resource.cpp |
diff --git a/third_party/WebKit/Source/core/fetch/Resource.cpp b/third_party/WebKit/Source/core/fetch/Resource.cpp |
index c481de075a3582a3b8c47d10158a998684da6045..20b69e38de6bd385ea801e11c98a8aafe177faef 100644 |
--- a/third_party/WebKit/Source/core/fetch/Resource.cpp |
+++ b/third_party/WebKit/Source/core/fetch/Resource.cpp |
@@ -48,6 +48,7 @@ |
#include "wtf/text/CString.h" |
#include "wtf/text/StringBuilder.h" |
#include <algorithm> |
+#include <memory> |
namespace blink { |
@@ -236,7 +237,7 @@ private: |
ResourceCallback(); |
void runTask(); |
- OwnPtr<CancellableTaskFactory> m_callbackTaskFactory; |
+ std::unique_ptr<CancellableTaskFactory> m_callbackTaskFactory; |
HeapHashSet<Member<Resource>> m_resourcesWithPendingClients; |
}; |
@@ -567,7 +568,7 @@ bool Resource::unlock() |
return true; |
} |
-void Resource::responseReceived(const ResourceResponse& response, PassOwnPtr<WebDataConsumerHandle>) |
+void Resource::responseReceived(const ResourceResponse& response, std::unique_ptr<WebDataConsumerHandle>) |
{ |
m_responseTimestamp = currentTime(); |
if (m_preloadDiscoveryTime) { |