Index: third_party/WebKit/Source/platform/exported/WebContentSettingCallbacks.cpp |
diff --git a/third_party/WebKit/Source/platform/exported/WebContentSettingCallbacks.cpp b/third_party/WebKit/Source/platform/exported/WebContentSettingCallbacks.cpp |
index de907f6e6b835592696b6e22a7c76aa8c9c7a30d..2524e1476983f547115d8e040266c070555d9f73 100644 |
--- a/third_party/WebKit/Source/platform/exported/WebContentSettingCallbacks.cpp |
+++ b/third_party/WebKit/Source/platform/exported/WebContentSettingCallbacks.cpp |
@@ -6,12 +6,13 @@ |
#include "platform/ContentSettingCallbacks.h" |
#include "wtf/RefCounted.h" |
+#include <memory> |
namespace blink { |
class WebContentSettingCallbacksPrivate : public RefCounted<WebContentSettingCallbacksPrivate> { |
public: |
- static PassRefPtr<WebContentSettingCallbacksPrivate> create(PassOwnPtr<ContentSettingCallbacks> callbacks) |
+ static PassRefPtr<WebContentSettingCallbacksPrivate> create(std::unique_ptr<ContentSettingCallbacks> callbacks) |
{ |
return adoptRef(new WebContentSettingCallbacksPrivate(std::move(callbacks))); |
} |
@@ -19,11 +20,11 @@ public: |
ContentSettingCallbacks* callbacks() { return m_callbacks.get(); } |
private: |
- WebContentSettingCallbacksPrivate(PassOwnPtr<ContentSettingCallbacks> callbacks) : m_callbacks(std::move(callbacks)) { } |
- OwnPtr<ContentSettingCallbacks> m_callbacks; |
+ WebContentSettingCallbacksPrivate(std::unique_ptr<ContentSettingCallbacks> callbacks) : m_callbacks(std::move(callbacks)) { } |
+ std::unique_ptr<ContentSettingCallbacks> m_callbacks; |
}; |
-WebContentSettingCallbacks::WebContentSettingCallbacks(PassOwnPtr<ContentSettingCallbacks>&& callbacks) |
+WebContentSettingCallbacks::WebContentSettingCallbacks(std::unique_ptr<ContentSettingCallbacks>&& callbacks) |
{ |
m_private = WebContentSettingCallbacksPrivate::create(std::move(callbacks)); |
} |