| Index: third_party/WebKit/Source/platform/mediastream/MediaStreamDescriptor.h
|
| diff --git a/third_party/WebKit/Source/platform/mediastream/MediaStreamDescriptor.h b/third_party/WebKit/Source/platform/mediastream/MediaStreamDescriptor.h
|
| index db4dd8d5baadbda9a6a7f22250bc65b9a9b94634..fbbc8464067dd4418066ae8e6cb97e5f5072030e 100644
|
| --- a/third_party/WebKit/Source/platform/mediastream/MediaStreamDescriptor.h
|
| +++ b/third_party/WebKit/Source/platform/mediastream/MediaStreamDescriptor.h
|
| @@ -37,6 +37,7 @@
|
| #include "wtf/Allocator.h"
|
| #include "wtf/Forward.h"
|
| #include "wtf/Vector.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -89,7 +90,7 @@ public:
|
| void setEnded() { m_ended = true; }
|
|
|
| ExtraData* getExtraData() const { return m_extraData.get(); }
|
| - void setExtraData(PassOwnPtr<ExtraData> extraData) { m_extraData = std::move(extraData); }
|
| + void setExtraData(std::unique_ptr<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.
|
| @@ -107,7 +108,7 @@ private:
|
| bool m_active;
|
| bool m_ended;
|
|
|
| - OwnPtr<ExtraData> m_extraData;
|
| + std::unique_ptr<ExtraData> m_extraData;
|
| };
|
|
|
| typedef HeapVector<Member<MediaStreamDescriptor>> MediaStreamDescriptorVector;
|
|
|