| Index: third_party/WebKit/Source/platform/ContentSettingCallbacks.h
|
| diff --git a/third_party/WebKit/Source/platform/ContentSettingCallbacks.h b/third_party/WebKit/Source/platform/ContentSettingCallbacks.h
|
| index 08f52831755bf8fbb164675d5ae6ec97b414a11a..2a76970df5809fbe3fda63235237acaade806125 100644
|
| --- a/third_party/WebKit/Source/platform/ContentSettingCallbacks.h
|
| +++ b/third_party/WebKit/Source/platform/ContentSettingCallbacks.h
|
| @@ -9,7 +9,8 @@
|
| #include "wtf/Allocator.h"
|
| #include "wtf/Functional.h"
|
| #include "wtf/Noncopyable.h"
|
| -#include <memory>
|
| +#include "wtf/OwnPtr.h"
|
| +#include "wtf/PassOwnPtr.h"
|
|
|
| namespace blink {
|
|
|
| @@ -17,7 +18,7 @@ class PLATFORM_EXPORT ContentSettingCallbacks {
|
| USING_FAST_MALLOC(ContentSettingCallbacks);
|
| WTF_MAKE_NONCOPYABLE(ContentSettingCallbacks);
|
| public:
|
| - static std::unique_ptr<ContentSettingCallbacks> create(std::unique_ptr<SameThreadClosure> allowed, std::unique_ptr<SameThreadClosure> denied);
|
| + static PassOwnPtr<ContentSettingCallbacks> create(std::unique_ptr<SameThreadClosure> allowed, std::unique_ptr<SameThreadClosure> denied);
|
| virtual ~ContentSettingCallbacks() { }
|
|
|
| void onAllowed() { (*m_allowed)(); }
|
|
|