Replace scoped_ptr with unique_ptr in webrtc/voice_engine/

webrtc/base/scoped_ptr.h

 /*
  *  Copyright 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.
  */
 
@@ skipping 70 matching lines @@
 
 // This is an implementation designed to match the anticipated future TR2
 // implementation of the scoped_ptr class.
 
 #include <assert.h>
 #include <stddef.h>
 #include <stdlib.h>
 
 #include <algorithm>  // For std::swap().
 #include <cstddef>
+#include <memory>
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/deprecation.h"
 #include "webrtc/base/template_util.h"
 #include "webrtc/typedefs.h"
 
 namespace rtc {
 
 // Function object which deletes its parameter, which must be a pointer.
 // If C is an array type, invokes 'delete[]' on the parameter; otherwise,
@@ skipping 497 matching lines @@
   // scoped_ptrs.
   template <class U> bool operator==(scoped_ptr<U> const& p2) const;
   template <class U> bool operator!=(scoped_ptr<U> const& p2) const;
 };
 
 template <class T, class D>
 void swap(rtc::scoped_ptr<T, D>& p1, rtc::scoped_ptr<T, D>& p2) {
   p1.swap(p2);
 }
 
+// Convert between the most common kinds of scoped_ptr and unique_ptr.
+template <typename T>
+std::unique_ptr<T> ScopedToUnique(scoped_ptr<T> sp) {
+  return std::unique_ptr<T>(sp.release());
+}
+template <typename T>
+scoped_ptr<T> UniqueToScoped(std::unique_ptr<T> up) {
+  return scoped_ptr<T>(up.release());
+}
+
 }  // namespace rtc
 
 template <class T, class D>
 bool operator==(T* p1, const rtc::scoped_ptr<T, D>& p2) {
   return p1 == p2.get();
 }
 
 template <class T, class D>
 bool operator!=(T* p1, const rtc::scoped_ptr<T, D>& p2) {
   return p1 != p2.get();
 }
 
 // A function to convert T* into scoped_ptr<T>
 // Doing e.g. make_scoped_ptr(new FooBarBaz<type>(arg)) is a shorter notation
 // for scoped_ptr<FooBarBaz<type> >(new FooBarBaz<type>(arg))
 template <typename T>
 rtc::scoped_ptr<T> rtc_make_scoped_ptr(T* ptr) {
   return rtc::scoped_ptr<T>(ptr);
 }
 
 #endif  // #ifndef WEBRTC_BASE_SCOPED_PTR_H__