Relanding: Use std::unique_ptr instead of rtc::scoped_refptr in AsyncInvoker.

webrtc/base/messagequeue.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_MESSAGEQUEUE_H_
 #define WEBRTC_BASE_MESSAGEQUEUE_H_
 
 #include <string.h>
 
 #include <algorithm>
 #include <list>
 #include <memory>
 #include <queue>
+#include <utility>
 #include <vector>
 
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/location.h"
 #include "webrtc/base/messagehandler.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/base/sharedexclusivelock.h"
 #include "webrtc/base/sigslot.h"
@@ skipping 61 matching lines @@
   const T& data() const { return data_; }
   T& data() { return data_; }
  private:
   T data_;
 };
 
 // Like TypedMessageData, but for pointers that require a delete.
 template <class T>
 class ScopedMessageData : public MessageData {
  public:
-  explicit ScopedMessageData(T* data) : data_(data) { }
+  explicit ScopedMessageData(std::unique_ptr<T> data)
+      : data_(std::move(data)) {}
+  // Deprecated.
+  // TODO(deadbeef): Remove this once downstream applications stop using it.
+  explicit ScopedMessageData(T* data) : data_(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_; }
+
  private:
   std::unique_ptr<T> data_;
 };
 
 // Like ScopedMessageData, but for reference counted pointers.
 template <class T>
 class ScopedRefMessageData : public MessageData {
  public:
   explicit ScopedRefMessageData(T* data) : data_(data) { }
   const scoped_refptr<T>& data() const { return data_; }
@@ skipping 194 matching lines @@
   // Used if SocketServer ownership lies with |this|.
   std::unique_ptr<SocketServer> own_ss_;
   SharedExclusiveLock ss_lock_;
 
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(MessageQueue);
 };
 
 }  // namespace rtc
 
 #endif  // WEBRTC_BASE_MESSAGEQUEUE_H_