Revert "Remove OwnPtr from Blink."

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/mediasession/MediaSession.h"
 
 #include "core/dom/Document.h"
 #include "core/testing/DummyPageHolder.h"
 #include "modules/mediasession/MediaMetadata.h"
 #include "modules/mediasession/MediaMetadataInit.h"
 #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;
 
 namespace blink {
 
 class MediaSessionTest : public ::testing::Test {
 protected:
     MediaSessionTest()
         : m_page(DummyPageHolder::create(IntSize(1, 1)))
     {}
 
     MediaSession* createMediaSession(WebMediaSession* webMediaSession)
     {
         // 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 {
 
 class MockWebMediaSession : public WebMediaSession {
 public:
     MOCK_METHOD1(activate, void(WebMediaSessionActivateCallback*));
     MOCK_METHOD1(deactivate, void(WebMediaSessionDeactivateCallback*));
     MOCK_METHOD1(setMetadata, void(const WebMediaMetadata*));
 };
@@ skipping 43 matching lines @@
     MediaSession* mediaSession = createMediaSession(mockWebMediaSession);
 
     EXPECT_CALL(*mockWebMediaSession, setMetadata(testing::NotNull()));
     mediaSession->setMetadata(MediaMetadata::create(&document(), MediaMetadataInit()));
 
     EXPECT_NE(nullptr, mediaSession->metadata());
 }
 
 } // namespace
 } // namespace blink