Index: third_party/WebKit/Source/web/FrameLoaderClientImpl.h |
diff --git a/third_party/WebKit/Source/web/FrameLoaderClientImpl.h b/third_party/WebKit/Source/web/FrameLoaderClientImpl.h |
index a8035c553bbcf70f3f26b568a60912739ab87e2b..46f1519ab5bc4f2fe41bf4e01530baa3380db6c6 100644 |
--- a/third_party/WebKit/Source/web/FrameLoaderClientImpl.h |
+++ b/third_party/WebKit/Source/web/FrameLoaderClientImpl.h |
@@ -36,8 +36,8 @@ |
#include "platform/heap/Handle.h" |
#include "platform/weborigin/KURL.h" |
#include "public/platform/WebInsecureRequestPolicy.h" |
+#include "wtf/PassOwnPtr.h" |
#include "wtf/RefPtr.h" |
-#include <memory> |
namespace blink { |
@@ -131,8 +131,8 @@ public: |
HTMLPlugInElement*, const KURL&, |
const Vector<WTF::String>&, const Vector<WTF::String>&, |
const WTF::String&, bool loadManually, DetachedPluginPolicy) override; |
- std::unique_ptr<WebMediaPlayer> createWebMediaPlayer(HTMLMediaElement&, const WebMediaPlayerSource&, WebMediaPlayerClient*) override; |
- std::unique_ptr<WebMediaSession> createWebMediaSession() override; |
+ PassOwnPtr<WebMediaPlayer> createWebMediaPlayer(HTMLMediaElement&, const WebMediaPlayerSource&, WebMediaPlayerClient*) override; |
+ PassOwnPtr<WebMediaSession> createWebMediaSession() override; |
ObjectContentType getObjectContentType( |
const KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForImages) override; |
void didChangeScrollOffset() override; |
@@ -165,12 +165,12 @@ public: |
void dispatchWillInsertBody() override; |
- std::unique_ptr<WebServiceWorkerProvider> createServiceWorkerProvider() override; |
+ PassOwnPtr<WebServiceWorkerProvider> createServiceWorkerProvider() override; |
bool isControlledByServiceWorker(DocumentLoader&) override; |
int64_t serviceWorkerID(DocumentLoader&) override; |
SharedWorkerRepositoryClient* sharedWorkerRepositoryClient() override; |
- std::unique_ptr<WebApplicationCacheHost> createApplicationCacheHost(WebApplicationCacheHostClient*) override; |
+ PassOwnPtr<WebApplicationCacheHost> createApplicationCacheHost(WebApplicationCacheHostClient*) override; |
void dispatchDidChangeManifest() override; |