Index: third_party/WebKit/Source/platform/blob/BlobData.cpp |
diff --git a/third_party/WebKit/Source/platform/blob/BlobData.cpp b/third_party/WebKit/Source/platform/blob/BlobData.cpp |
index 4a82ea4be58c60da118e51294184f1a69698273d..85c4f2e5961d5a07a84b3c12079b79ea57d56601 100644 |
--- a/third_party/WebKit/Source/platform/blob/BlobData.cpp |
+++ b/third_party/WebKit/Source/platform/blob/BlobData.cpp |
@@ -33,13 +33,12 @@ |
#include "platform/UUID.h" |
#include "platform/blob/BlobRegistry.h" |
#include "platform/text/LineEnding.h" |
+#include "wtf/OwnPtr.h" |
#include "wtf/PassRefPtr.h" |
-#include "wtf/PtrUtil.h" |
#include "wtf/RefPtr.h" |
#include "wtf/Vector.h" |
#include "wtf/text/CString.h" |
#include "wtf/text/TextEncoding.h" |
-#include <memory> |
namespace blink { |
@@ -79,9 +78,9 @@ void BlobDataItem::detachFromCurrentThread() |
fileSystemURL = fileSystemURL.copy(); |
} |
-std::unique_ptr<BlobData> BlobData::create() |
+PassOwnPtr<BlobData> BlobData::create() |
{ |
- return wrapUnique(new BlobData()); |
+ return adoptPtr(new BlobData()); |
} |
void BlobData::detachFromCurrentThread() |
@@ -204,7 +203,7 @@ BlobDataHandle::BlobDataHandle() |
BlobRegistry::registerBlobData(m_uuid, BlobData::create()); |
} |
-BlobDataHandle::BlobDataHandle(std::unique_ptr<BlobData> data, long long size) |
+BlobDataHandle::BlobDataHandle(PassOwnPtr<BlobData> data, long long size) |
: m_uuid(createCanonicalUUIDString()) |
, m_type(data->contentType().isolatedCopy()) |
, m_size(size) |