Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/core/html/HTMLMediaElement.h

Index: third_party/WebKit/Source/core/html/HTMLMediaElement.h
diff --git a/third_party/WebKit/Source/core/html/HTMLMediaElement.h b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
index 79c1a3ec62e7b498568895d9981f32b9aa75cc77..653bd31414424e201ea67841db7031fe26075257 100644
--- a/third_party/WebKit/Source/core/html/HTMLMediaElement.h
+++ b/third_party/WebKit/Source/core/html/HTMLMediaElement.h
@@ -40,7 +40,6 @@
 #include "public/platform/WebAudioSourceProviderClient.h"
 #include "public/platform/WebMediaPlayerClient.h"
 #include "public/platform/WebMimeRegistry.h"
-#include <memory>
 
 namespace blink {
 
@@ -548,7 +547,7 @@ private:
     DeferredLoadState m_deferredLoadState;
     Timer<HTMLMediaElement> m_deferredLoadTimer;
 
-    std::unique_ptr<WebMediaPlayer> m_webMediaPlayer;
+    OwnPtr<WebMediaPlayer> m_webMediaPlayer;
     WebLayer* m_webLayer;
 
     DisplayMode m_displayMode;
@@ -597,8 +596,8 @@ private:
     Member<CueTimeline> m_cueTimeline;
 
     HeapVector<Member<ScriptPromiseResolver>> m_playPromiseResolvers;
-    std::unique_ptr<CancellableTaskFactory> m_playPromiseResolveTask;
-    std::unique_ptr<CancellableTaskFactory> m_playPromiseRejectTask;
+    OwnPtr<CancellableTaskFactory> m_playPromiseResolveTask;
+    OwnPtr<CancellableTaskFactory> m_playPromiseRejectTask;
     HeapVector<Member<ScriptPromiseResolver>> m_playPromiseResolveList;
     HeapVector<Member<ScriptPromiseResolver>> m_playPromiseRejectList;
     ExceptionCode m_playPromiseErrorCode;