commit bfefb03ec124105f49a19952fa73cf1861b0f262
author kwiberg <kwiberg@webrtc.org> Sun May 01 14:53:46 2016 -0700
committer Commit bot <commit-bot@chromium.org> Sun May 01 21:53:55 2016 +0000
tree 2142689beaf4b3f17c5561dae18d18c14db39080
parent e319059de29e142b92095f56a8149e3209de17d0

Replace scoped_ptr with unique_ptr everywhere

But keep #including scoped_ptr.h in .h files, so as not to break
WebRTC users who expect those .h files to give them rtc::scoped_ptr.

BUG=webrtc:5520

Review-Url: https://codereview.webrtc.org/1937693002
Cr-Commit-Position: refs/heads/master@{#12581}

webrtc/system_wrappers/source/file_impl.h

diff --git a/webrtc/system_wrappers/source/file_impl.h b/webrtc/system_wrappers/source/file_impl.h
index 06ba582..8764f72 100644
--- a/webrtc/system_wrappers/source/file_impl.h
+++ b/webrtc/system_wrappers/source/file_impl.h
@@ -13,6 +13,8 @@
 
 #include <stdio.h>
 
+#include <memory>
+
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/system_wrappers/include/file_wrapper.h"
 
@@ -52,7 +54,7 @@
   int CloseFileImpl();
   int FlushImpl();
 
-  rtc::scoped_ptr<RWLockWrapper> rw_lock_;
+  std::unique_ptr<RWLockWrapper> rw_lock_;
 
   FILE* id_;
   bool managed_file_handle_;