Replace scoped_ptr with unique_ptr in webrtc/modules/video_*/

webrtc/modules/video_render/android/video_render_android_impl.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_ANDROID_VIDEO_RENDER_ANDROID_IMPL_H_
 #define WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_ANDROID_VIDEO_RENDER_ANDROID_IMPL_H_
 
 #include <jni.h>
 
 #include <map>
+#include <memory>
 
 #include "webrtc/base/platform_thread.h"
 #include "webrtc/modules/video_render/i_video_render.h"
 
 
 namespace webrtc {
 
 //#define ANDROID_LOG
 
 class CriticalSectionWrapper;
@@ skipping 110 matching lines @@
 
   // Map with streams to render.
   typedef std::map<int32_t, AndroidStream*> AndroidStreamMap;
   AndroidStreamMap _streamsMap;
   // True if the _javaRenderThread thread shall be detached from the JVM.
   bool _javaShutDownFlag;
   EventWrapper& _javaShutdownEvent;
   EventWrapper& _javaRenderEvent;
   int64_t _lastJavaRenderEvent;
   JNIEnv* _javaRenderJniEnv; // JNIEnv for the java render thread.
-  // TODO(pbos): Remove scoped_ptr and use the member directly.
-  rtc::scoped_ptr<rtc::PlatformThread> _javaRenderThread;
+  // TODO(pbos): Remove unique_ptr and use the member directly.
+  std::unique_ptr<rtc::PlatformThread> _javaRenderThread;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_RENDER_MAIN_SOURCE_ANDROID_VIDEO_RENDER_ANDROID_IMPL_H_