Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/modules/mediasession/MediaSessionTest.cpp

Index: third_party/WebKit/Source/modules/mediasession/MediaSessionTest.cpp
diff --git a/third_party/WebKit/Source/modules/mediasession/MediaSessionTest.cpp b/third_party/WebKit/Source/modules/mediasession/MediaSessionTest.cpp
index 165d225e52c42d7b08c614230407fb7d6977088e..654d9b6c93ee87d114ac2ff9f310041a61882b71 100644
--- a/third_party/WebKit/Source/modules/mediasession/MediaSessionTest.cpp
+++ b/third_party/WebKit/Source/modules/mediasession/MediaSessionTest.cpp
@@ -11,8 +11,6 @@
 #include "public/platform/modules/mediasession/WebMediaSession.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
 
 using ::testing::_;
 using ::testing::Invoke;
@@ -29,13 +27,13 @@ protected:
     {
         // The MediaSession takes ownership of the WebMediaSession, and the
         // caller must take care to not end up with a stale pointer.
-        return new MediaSession(wrapUnique(webMediaSession));
+        return new MediaSession(adoptPtr(webMediaSession));
     }
 
     Document& document() { return m_page->document(); }
     ScriptState* mainScriptState() { return ScriptState::forMainWorld(document().frame()); }
 private:
-    std::unique_ptr<DummyPageHolder> m_page;
+    OwnPtr<DummyPageHolder> m_page;
 };
 
 namespace {