Replace the remaining scoped_ptr with unique_ptr in webrtc/modules/ (This is a re-land of https://codereview.webrtc.org/1921233002, which got reverted for breaking Chromium.) BUG=webrtc:5520 Review URL: https://codereview.webrtc.org/1923133002 Cr-Commit-Position: refs/heads/master@{#12522}
diff --git a/webrtc/modules/desktop_capture/shared_memory.h b/webrtc/modules/desktop_capture/shared_memory.h index 45f531e..e1d1e7c 100644 --- a/webrtc/modules/desktop_capture/shared_memory.h +++ b/webrtc/modules/desktop_capture/shared_memory.h
@@ -17,6 +17,8 @@ #include <windows.h> #endif +#include <memory> + #include "webrtc/base/constructormagic.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/typedefs.h" @@ -69,7 +71,7 @@ SharedMemoryFactory() {} virtual ~SharedMemoryFactory() {} - virtual rtc::scoped_ptr<SharedMemory> CreateSharedMemory(size_t size) = 0; + virtual std::unique_ptr<SharedMemory> CreateSharedMemory(size_t size) = 0; private: RTC_DISALLOW_COPY_AND_ASSIGN(SharedMemoryFactory);