commit 0149e7595ecb9ca76363b45b1e807ba9f26e6a5d
author kwiberg <kwiberg@webrtc.org> Fri Mar 11 14:40:52 2016 -0800
committer Commit bot <commit-bot@chromium.org> Fri Mar 11 22:40:59 2016 +0000
tree 97e6dbece208375f187d8a54320f54074a1eb56a
parent 3102294fc0dcccb3aad1e9fd7104a4ba2191c7cb

Remove the (previosly deprecated) Pass methods

Everyone should be using std::move instead.

BUG=webrtc:5373

Review URL: https://codereview.webrtc.org/1778243006

Cr-Commit-Position: refs/heads/master@{#11962}

webrtc/base/buffer.h

diff --git a/webrtc/base/buffer.h b/webrtc/base/buffer.h
index e9c47ee..681348d 100644
--- a/webrtc/base/buffer.h
+++ b/webrtc/base/buffer.h
@@ -18,7 +18,6 @@
 #include "webrtc/base/array_view.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/base/deprecation.h"
 
 namespace rtc {
 
@@ -229,15 +228,6 @@
     RTC_DCHECK(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() {
-    RTC_DCHECK(IsConsistent());
-    return std::move(*this);
-  }
-
   // Resets the buffer to zero size without altering capacity. Works even if the
   // buffer has been moved from.
   void Clear() {

webrtc/base/buffer_unittest.cc

diff --git a/webrtc/base/buffer_unittest.cc b/webrtc/base/buffer_unittest.cc
index 80d2692..7c65447 100644
--- a/webrtc/base/buffer_unittest.cc
+++ b/webrtc/base/buffer_unittest.cc
@@ -138,7 +138,7 @@
 TEST(BufferTest, TestMoveConstruct) {
   Buffer buf1(kTestData, 3, 40);
   const uint8_t* data = buf1.data();
-  Buffer buf2(buf1.DEPRECATED_Pass());
+  Buffer buf2(std::move(buf1));
   EXPECT_EQ(buf2.size(), 3u);
   EXPECT_EQ(buf2.capacity(), 40u);
   EXPECT_EQ(buf2.data(), data);
@@ -152,7 +152,7 @@
   Buffer buf1(kTestData, 3, 40);
   const uint8_t* data = buf1.data();
   Buffer buf2(kTestData);
-  buf2 = buf1.DEPRECATED_Pass();
+  buf2 = std::move(buf1);
   EXPECT_EQ(buf2.size(), 3u);
   EXPECT_EQ(buf2.capacity(), 40u);
   EXPECT_EQ(buf2.data(), data);

webrtc/base/scoped_ptr.h

diff --git a/webrtc/base/scoped_ptr.h b/webrtc/base/scoped_ptr.h
index 955bcfe..b7e9498 100644
--- a/webrtc/base/scoped_ptr.h
+++ b/webrtc/base/scoped_ptr.h
@@ -91,7 +91,6 @@
 #include <memory>
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/base/deprecation.h"
 #include "webrtc/base/template_util.h"
 #include "webrtc/typedefs.h"
 
@@ -375,12 +374,6 @@
   scoped_ptr(const scoped_ptr& other) = delete;
   scoped_ptr& operator=(const scoped_ptr& other) = delete;
 
-  // Get an rvalue reference. (sp.Pass() does the same thing as std::move(sp).)
-  // Deprecated; remove in March 2016 (bug 5373).
-  RTC_DEPRECATED scoped_ptr&& Pass() {
-    return std::move(*this);
-  }
-
   // Reset.  Deletes the currently owned object, if any.
   // Then takes ownership of a new object, if given.
   void reset(element_type* p = nullptr) { impl_.reset(p); }
@@ -511,12 +504,6 @@
   scoped_ptr(const scoped_ptr& other) = delete;
   scoped_ptr& operator=(const scoped_ptr& other) = delete;
 
-  // Get an rvalue reference. (sp.Pass() does the same thing as std::move(sp).)
-  // Deprecated; remove in March 2016 (bug 5373).
-  RTC_DEPRECATED scoped_ptr&& Pass() {
-    return std::move(*this);
-  }
-
   // Reset.  Deletes the currently owned array, if any.
   // Then takes ownership of a new object, if given.
   void reset(element_type* array = nullptr) { impl_.reset(array); }