rtc::Buffer: Replace an internal rtc::scoped_ptr with std::unique_ptr

webrtc/base/buffer.h

 /*
  *  Copyright 2004 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_BASE_BUFFER_H_
 #define WEBRTC_BASE_BUFFER_H_
 
 #include <algorithm>  // std::swap (pre-C++11)
 #include <cassert>
 #include <cstring>
+#include <memory>
 #include <utility>  // std::swap (C++11 and later)
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/deprecation.h"
-#include "webrtc/base/scoped_ptr.h"
 
 namespace rtc {
 
 namespace internal {
 
 // (Internal; please don't use outside this file.) ByteType<T>::t is int if T
 // is uint8_t, int8_t, or char; otherwise, it's a compilation error. Use like
 // this:
 //
 //   template <typename T, typename ByteType<T>::t = 0>
@@ skipping 126 matching lines @@
     size_ = size;
   }
 
   // Ensure that the buffer size can be increased to at least capacity without
   // further reallocation. (Of course, this operation might need to reallocate
   // the buffer.)
   void EnsureCapacity(size_t capacity) {
     assert(IsConsistent());
     if (capacity <= capacity_)
       return;
-    scoped_ptr<uint8_t[]> new_data(new uint8_t[capacity]);
+    std::unique_ptr<uint8_t[]> new_data(new uint8_t[capacity]);
     std::memcpy(new_data.get(), data_.get(), size_);
     data_ = std::move(new_data);
     capacity_ = capacity;
     assert(IsConsistent());
   }
 
   // b.Pass() does the same thing as std::move(b).
   // Deprecated; remove in March 2016 (bug 5373).
   RTC_DEPRECATED Buffer&& Pass() { return DEPRECATED_Pass(); }
   Buffer&& DEPRECATED_Pass() {
@@ skipping 37 matching lines @@
     capacity_ = 0;
 #else
     // Ensure that *this is always inconsistent, to provoke bugs.
     size_ = 1;
     capacity_ = 0;
 #endif
   }
 
   size_t size_;
   size_t capacity_;
-  scoped_ptr<uint8_t[]> data_;
+  std::unique_ptr<uint8_t[]> data_;
 };
 
 }  // namespace rtc
 
 #endif  // WEBRTC_BASE_BUFFER_H_