Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/mediastream/MediaStreamDescriptor.h

 /*
  * Copyright (C) 2011 Ericsson AB. All rights reserved.
  * Copyright (C) 2012 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:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 19 matching lines @@
  */
 
 #ifndef MediaStreamDescriptor_h
 #define MediaStreamDescriptor_h
 
 #include "platform/mediastream/MediaStreamComponent.h"
 #include "platform/mediastream/MediaStreamSource.h"
 #include "wtf/Allocator.h"
 #include "wtf/Forward.h"
 #include "wtf/Vector.h"
-#include <memory>
 
 namespace blink {
 
 class PLATFORM_EXPORT MediaStreamDescriptorClient : public GarbageCollectedMixin {
 public:
     virtual ~MediaStreamDescriptorClient() { }
 
     virtual void streamEnded() = 0;
     virtual void addRemoteTrack(MediaStreamComponent*) = 0;
     virtual void removeRemoteTrack(MediaStreamComponent*) = 0;
@@ skipping 32 matching lines @@
     void addRemoteTrack(MediaStreamComponent*);
     void removeRemoteTrack(MediaStreamComponent*);
 
     bool active() const { return m_active; }
     void setActive(bool active) { m_active = active; }
 
     bool ended() const { return m_ended; }
     void setEnded() { m_ended = true; }
 
     ExtraData* getExtraData() const { return m_extraData.get(); }
-    void setExtraData(std::unique_ptr<ExtraData> extraData) { m_extraData = std::move(extraData); }
+    void setExtraData(PassOwnPtr<ExtraData> extraData) { m_extraData = std::move(extraData); }
 
     // |m_extraData| may hold pointers to GC objects, and it may touch them in destruction.
     // So this class is eagerly finalized to finalize |m_extraData| promptly.
     EAGERLY_FINALIZE();
     DECLARE_TRACE();
 
 private:
     MediaStreamDescriptor(const String& id, const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources);
     MediaStreamDescriptor(const String& id, const MediaStreamComponentVector& audioComponents, const MediaStreamComponentVector& videoComponents);
 
     Member<MediaStreamDescriptorClient> m_client;
     String m_id;
     HeapVector<Member<MediaStreamComponent>> m_audioComponents;
     HeapVector<Member<MediaStreamComponent>> m_videoComponents;
     bool m_active;
     bool m_ended;
 
-    std::unique_ptr<ExtraData> m_extraData;
+    OwnPtr<ExtraData> m_extraData;
 };
 
 typedef HeapVector<Member<MediaStreamDescriptor>> MediaStreamDescriptorVector;
 
 } // namespace blink
 
 #endif // MediaStreamDescriptor_h