Index: third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.h |
diff --git a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.h b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.h |
index 4b33c0e8e073af796f8fa24eb24595a49b6c2c12..453404e7fce84d2dbeda4554f9b1950fece436ab 100644 |
--- a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.h |
+++ b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.h |
@@ -37,13 +37,12 @@ |
#include "platform/weborigin/KURL.h" |
#include "platform/weborigin/SecurityOrigin.h" |
#include "wtf/Forward.h" |
-#include "wtf/OwnPtr.h" |
-#include "wtf/PassOwnPtr.h" |
#include "wtf/PassRefPtr.h" |
#include "wtf/RefPtr.h" |
#include "wtf/text/AtomicString.h" |
#include "wtf/text/StringBuilder.h" |
#include "wtf/text/WTFString.h" |
+#include <memory> |
namespace blink { |
@@ -157,7 +156,7 @@ private: |
SecurityOrigin* getSecurityOrigin() const; |
void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override; |
- void didReceiveResponse(unsigned long identifier, const ResourceResponse&, PassOwnPtr<WebDataConsumerHandle>) override; |
+ void didReceiveResponse(unsigned long identifier, const ResourceResponse&, std::unique_ptr<WebDataConsumerHandle>) override; |
void didReceiveData(const char* data, unsigned dataLength) override; |
// When responseType is set to "blob", didDownloadData() is called instead |
// of didReceiveData(). |
@@ -193,7 +192,7 @@ private: |
bool responseIsXML() const; |
bool responseIsHTML() const; |
- PassOwnPtr<TextResourceDecoder> createDecoder() const; |
+ std::unique_ptr<TextResourceDecoder> createDecoder() const; |
void initResponseDocument(); |
void parseDocumentChunk(const char* data, unsigned dataLength); |
@@ -265,13 +264,13 @@ private: |
Member<Blob> m_responseBlob; |
Member<Stream> m_responseLegacyStream; |
- OwnPtr<ThreadableLoader> m_loader; |
+ std::unique_ptr<ThreadableLoader> m_loader; |
State m_state; |
ResourceResponse m_response; |
String m_finalResponseCharset; |
- OwnPtr<TextResourceDecoder> m_decoder; |
+ std::unique_ptr<TextResourceDecoder> m_decoder; |
ScriptString m_responseText; |
Member<Document> m_responseDocument; |