Index: third_party/WebKit/Source/core/loader/EmptyClients.h |
diff --git a/third_party/WebKit/Source/core/loader/EmptyClients.h b/third_party/WebKit/Source/core/loader/EmptyClients.h |
index 97882afb8b3a418a1df730e75ceedb48900d5651..72b4525e127bc526271215ed5030ce6d55328d8d 100644 |
--- a/third_party/WebKit/Source/core/loader/EmptyClients.h |
+++ b/third_party/WebKit/Source/core/loader/EmptyClients.h |
@@ -48,6 +48,7 @@ |
#include "public/platform/WebFrameScheduler.h" |
#include "public/platform/WebScreenInfo.h" |
#include "wtf/Forward.h" |
+#include <memory> |
#include <v8.h> |
/* |
@@ -176,7 +177,7 @@ public: |
void registerPopupOpeningObserver(PopupOpeningObserver*) override {} |
void unregisterPopupOpeningObserver(PopupOpeningObserver*) override {} |
- PassOwnPtr<WebFrameScheduler> createFrameScheduler(BlameContext*) override; |
+ std::unique_ptr<WebFrameScheduler> createFrameScheduler(BlameContext*) override; |
}; |
class CORE_EXPORT EmptyFrameLoaderClient : public FrameLoaderClient { |
@@ -251,8 +252,8 @@ public: |
LocalFrame* createFrame(const FrameLoadRequest&, const AtomicString&, HTMLFrameOwnerElement*) override; |
Widget* createPlugin(HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool, DetachedPluginPolicy) override; |
bool canCreatePluginWithoutRenderer(const String& mimeType) const override { return false; } |
- PassOwnPtr<WebMediaPlayer> createWebMediaPlayer(HTMLMediaElement&, const WebMediaPlayerSource&, WebMediaPlayerClient*) override; |
- PassOwnPtr<WebMediaSession> createWebMediaSession() override; |
+ std::unique_ptr<WebMediaPlayer> createWebMediaPlayer(HTMLMediaElement&, const WebMediaPlayerSource&, WebMediaPlayerClient*) override; |
+ std::unique_ptr<WebMediaSession> createWebMediaSession() override; |
ObjectContentType getObjectContentType(const KURL&, const String&, bool) override { return ObjectContentType(); } |
@@ -268,10 +269,10 @@ public: |
WebCookieJar* cookieJar() const override { return 0; } |
- PassOwnPtr<WebServiceWorkerProvider> createServiceWorkerProvider() override; |
+ std::unique_ptr<WebServiceWorkerProvider> createServiceWorkerProvider() override; |
bool isControlledByServiceWorker(DocumentLoader&) override { return false; } |
int64_t serviceWorkerID(DocumentLoader&) override { return -1; } |
- PassOwnPtr<WebApplicationCacheHost> createApplicationCacheHost(WebApplicationCacheHostClient*) override; |
+ std::unique_ptr<WebApplicationCacheHost> createApplicationCacheHost(WebApplicationCacheHostClient*) override; |
protected: |
EmptyFrameLoaderClient() {} |