Remove deprecated ScopedMessageData::data().

Bug: None
Change-Id: I9dcb93db8c882eb90d2c0eadcb08bf9fb0753772
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/227084
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34591}
diff --git a/rtc_base/async_invoker.cc b/rtc_base/async_invoker.cc
index 9d9dfd8..4cf0aca 100644
--- a/rtc_base/async_invoker.cc
+++ b/rtc_base/async_invoker.cc
@@ -42,7 +42,7 @@
   ScopedMessageData<AsyncClosure>* data =
       static_cast<ScopedMessageData<AsyncClosure>*>(msg->pdata);
   // Execute the closure and trigger the return message if needed.
-  data->inner_data().Execute();
+  data->data().Execute();
   delete data;
 }
 
diff --git a/rtc_base/thread_message.h b/rtc_base/thread_message.h
index e44ad7a..c610c3b 100644
--- a/rtc_base/thread_message.h
+++ b/rtc_base/thread_message.h
@@ -46,15 +46,9 @@
  public:
   explicit ScopedMessageData(std::unique_ptr<T> data)
       : data_(std::move(data)) {}
-  // Deprecated.
-  // TODO(deadbeef): Returning a reference to a unique ptr? Why. Get rid of
-  // this once downstream applications stop using it, then rename inner_data to
-  // just data.
-  const std::unique_ptr<T>& data() const { return data_; }
-  std::unique_ptr<T>& data() { return data_; }
 
-  const T& inner_data() const { return *data_; }
-  T& inner_data() { return *data_; }
+  const T& data() const { return *data_; }
+  T& data() { return *data_; }
 
   T* Release() { return data_.release(); }