Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "public/platform/WebMediaStreamSource.h"
 
 #include "platform/audio/AudioBus.h"
 #include "platform/mediastream/MediaStreamSource.h"
 #include "public/platform/WebAudioDestinationConsumer.h"
 #include "public/platform/WebMediaConstraints.h"
 #include "public/platform/WebString.h"
-#include "wtf/PtrUtil.h"
+#include "wtf/PassOwnPtr.h"
 #include "wtf/Vector.h"
-#include <memory>
 
 namespace blink {
 
 namespace {
 
 class ExtraDataContainer : public MediaStreamSource::ExtraData {
 public:
-    ExtraDataContainer(std::unique_ptr<WebMediaStreamSource::ExtraData> extraData) : m_extraData(std::move(extraData)) { }
+    ExtraDataContainer(PassOwnPtr<WebMediaStreamSource::ExtraData> extraData) : m_extraData(std::move(extraData)) { }
 
     WebMediaStreamSource::ExtraData* getExtraData() { return m_extraData.get(); }
 
 private:
-    std::unique_ptr<WebMediaStreamSource::ExtraData> m_extraData;
+    OwnPtr<WebMediaStreamSource::ExtraData> m_extraData;
 };
 
 } // namespace
 
 WebMediaStreamSource WebMediaStreamSource::ExtraData::owner()
 {
     ASSERT(m_owner);
     return WebMediaStreamSource(m_owner);
 }
 
@@ skipping 84 matching lines @@
     return static_cast<ExtraDataContainer*>(data)->getExtraData();
 }
 
 void WebMediaStreamSource::setExtraData(ExtraData* extraData)
 {
     ASSERT(!m_private.isNull());
 
     if (extraData)
         extraData->setOwner(m_private.get());
 
-    m_private->setExtraData(wrapUnique(new ExtraDataContainer(wrapUnique(extraData))));
+    m_private->setExtraData(adoptPtr(new ExtraDataContainer(adoptPtr(extraData))));
 }
 
 WebMediaConstraints WebMediaStreamSource::constraints()
 {
     ASSERT(!m_private.isNull());
     return m_private->constraints();
 }
 
 bool WebMediaStreamSource::requiresAudioConsumer() const
 {
@@ skipping 57 matching lines @@
         ConsumerWrapper* wrapper = static_cast<ConsumerWrapper*>(it->get());
         if (wrapper->consumer() == consumer) {
             m_private->removeAudioConsumer(wrapper);
             return true;
         }
     }
     return false;
 }
 
 } // namespace blink