Convert Pass()→std::move() in //media

media/cast/test/utility/udp_proxy.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "media/cast/test/utility/udp_proxy.h"
+
 #include <math.h>
 #include <stdlib.h>
+#include <utility>
 #include <vector>
 
-#include "media/cast/test/utility/udp_proxy.h"
-
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/rand_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
 #include "base/time/default_tick_clock.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/udp/udp_server_socket.h"
@@ skipping 10 matching lines @@
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
     base::TickClock* clock) {
   task_runner_ = task_runner;
   clock_ = clock;
   if (pipe_) {
     pipe_->InitOnIOThread(task_runner, clock);
   }
 }
 void PacketPipe::AppendToPipe(scoped_ptr<PacketPipe> pipe) {
   if (pipe_) {
-    pipe_->AppendToPipe(pipe.Pass());
+    pipe_->AppendToPipe(std::move(pipe));
   } else {
-    pipe_ = pipe.Pass();
+    pipe_ = std::move(pipe);
   }
 }
 
 // Roughly emulates a buffer inside a device.
 // If the buffer is full, packets are dropped.
 // Packets are output at a maximum bandwidth.
 class Buffer : public PacketPipe {
  public:
   Buffer(size_t buffer_size, double max_megabits_per_second)
       : buffer_size_(0),
@@ skipping 33 matching lines @@
     if (bytes_to_send < static_cast<int64_t>(buffer_.front()->size())) {
       bytes_to_send = buffer_.front()->size();
     }
     while (!buffer_.empty() &&
            static_cast<int64_t>(buffer_.front()->size()) <= bytes_to_send) {
       CHECK(!buffer_.empty());
       scoped_ptr<Packet> packet(buffer_.front().release());
       bytes_to_send -= packet->size();
       buffer_size_ -= packet->size();
       buffer_.pop_front();
-      pipe_->Send(packet.Pass());
+      pipe_->Send(std::move(packet));
     }
     if (!buffer_.empty()) {
       Schedule();
     }
   }
 
   std::deque<linked_ptr<Packet> > buffer_;
   base::TimeTicks last_schedule_;
   size_t buffer_size_;
   size_t max_buffer_size_;
   double max_megabits_per_second_;  // megabits per second
   base::WeakPtrFactory<Buffer> weak_factory_;
 };
 
 scoped_ptr<PacketPipe> NewBuffer(size_t buffer_size, double bandwidth) {
-  return scoped_ptr<PacketPipe>(new Buffer(buffer_size, bandwidth)).Pass();
+  return scoped_ptr<PacketPipe>(new Buffer(buffer_size, bandwidth));
 }
 
 class RandomDrop : public PacketPipe {
  public:
   RandomDrop(double drop_fraction)
       : drop_fraction_(static_cast<int>(drop_fraction * RAND_MAX)) {}
 
   void Send(scoped_ptr<Packet> packet) final {
     if (rand() > drop_fraction_) {
-      pipe_->Send(packet.Pass());
+      pipe_->Send(std::move(packet));
     }
   }
 
  private:
   int drop_fraction_;
 };
 
 scoped_ptr<PacketPipe> NewRandomDrop(double drop_fraction) {
-  return scoped_ptr<PacketPipe>(new RandomDrop(drop_fraction)).Pass();
+  return scoped_ptr<PacketPipe>(new RandomDrop(drop_fraction));
 }
 
 class SimpleDelayBase : public PacketPipe {
  public:
   SimpleDelayBase() : weak_factory_(this) {}
   ~SimpleDelayBase() override {}
 
   void Send(scoped_ptr<Packet> packet) override {
     double seconds = GetDelay();
     task_runner_->PostDelayedTask(
         FROM_HERE,
         base::Bind(&SimpleDelayBase::SendInternal, weak_factory_.GetWeakPtr(),
                    base::Passed(&packet)),
         base::TimeDelta::FromMicroseconds(static_cast<int64_t>(seconds * 1E6)));
   }
  protected:
   virtual double GetDelay() = 0;
 
  private:
   virtual void SendInternal(scoped_ptr<Packet> packet) {
-    pipe_->Send(packet.Pass());
+    pipe_->Send(std::move(packet));
   }
 
   base::WeakPtrFactory<SimpleDelayBase> weak_factory_;
 };
 
 class ConstantDelay : public SimpleDelayBase {
  public:
   ConstantDelay(double delay_seconds) : delay_seconds_(delay_seconds) {}
   double GetDelay() final { return delay_seconds_; }
 
  private:
   double delay_seconds_;
 };
 
 scoped_ptr<PacketPipe> NewConstantDelay(double delay_seconds) {
-  return scoped_ptr<PacketPipe>(new ConstantDelay(delay_seconds)).Pass();
+  return scoped_ptr<PacketPipe>(new ConstantDelay(delay_seconds));
 }
 
 class RandomUnsortedDelay : public SimpleDelayBase {
  public:
   RandomUnsortedDelay(double random_delay) : random_delay_(random_delay) {}
 
   double GetDelay() override { return random_delay_ * base::RandDouble(); }
 
  private:
   double random_delay_;
 };
 
 scoped_ptr<PacketPipe> NewRandomUnsortedDelay(double random_delay) {
-  return scoped_ptr<PacketPipe>(new RandomUnsortedDelay(random_delay)).Pass();
+  return scoped_ptr<PacketPipe>(new RandomUnsortedDelay(random_delay));
 }
 
 class DuplicateAndDelay : public RandomUnsortedDelay {
  public:
   DuplicateAndDelay(double delay_min,
                     double random_delay) :
       RandomUnsortedDelay(random_delay),
       delay_min_(delay_min) {
   }
   void Send(scoped_ptr<Packet> packet) final {
     pipe_->Send(scoped_ptr<Packet>(new Packet(*packet.get())));
-    RandomUnsortedDelay::Send(packet.Pass());
+    RandomUnsortedDelay::Send(std::move(packet));
   }
   double GetDelay() final {
     return RandomUnsortedDelay::GetDelay() + delay_min_;
   }
  private:
   double delay_min_;
 };
 
 scoped_ptr<PacketPipe> NewDuplicateAndDelay(double delay_min,
                                             double random_delay) {
-  return scoped_ptr<PacketPipe>(
-      new DuplicateAndDelay(delay_min, random_delay)).Pass();
+  return scoped_ptr<PacketPipe>(new DuplicateAndDelay(delay_min, random_delay));
 }
 
 class RandomSortedDelay : public PacketPipe {
  public:
   RandomSortedDelay(double random_delay,
                     double extra_delay,
                     double seconds_between_extra_delay)
       : random_delay_(random_delay),
         extra_delay_(extra_delay),
         seconds_between_extra_delay_(seconds_between_extra_delay),
@@ skipping 37 matching lines @@
     // An extra delay just happened, wait up to seconds_between_extra_delay_*2
     // before scheduling another one to make the average equal to
     // seconds_between_extra_delay_.
     ScheduleExtraDelay(2.0);
   }
 
   void ProcessBuffer() {
     base::TimeTicks now = clock_->NowTicks();
     while (!buffer_.empty() && next_send_ <= now) {
       scoped_ptr<Packet> packet(buffer_.front().release());
-      pipe_->Send(packet.Pass());
+      pipe_->Send(std::move(packet));
       buffer_.pop_front();
 
       next_send_ += base::TimeDelta::FromSecondsD(
           base::RandDouble() * random_delay_);
     }
 
     if (!buffer_.empty()) {
       task_runner_->PostDelayedTask(
           FROM_HERE,
           base::Bind(&RandomSortedDelay::ProcessBuffer,
                      weak_factory_.GetWeakPtr()),
           next_send_ - now);
     }
   }
 
   base::TimeTicks block_until_;
   std::deque<linked_ptr<Packet> > buffer_;
   double random_delay_;
   double extra_delay_;
   double seconds_between_extra_delay_;
   base::TimeTicks next_send_;
   base::WeakPtrFactory<RandomSortedDelay> weak_factory_;
 };
 
 scoped_ptr<PacketPipe> NewRandomSortedDelay(
     double random_delay,
     double extra_delay,
     double seconds_between_extra_delay) {
-  return scoped_ptr<PacketPipe>(
-             new RandomSortedDelay(
-                 random_delay, extra_delay, seconds_between_extra_delay))
-      .Pass();
+  return scoped_ptr<PacketPipe>(new RandomSortedDelay(
+      random_delay, extra_delay, seconds_between_extra_delay));
 }
 
 class NetworkGlitchPipe : public PacketPipe {
  public:
   NetworkGlitchPipe(double average_work_time, double average_outage_time)
       : works_(false),
         max_work_time_(average_work_time * 2),
         max_outage_time_(average_outage_time * 2),
         weak_factory_(this) {}
 
   void InitOnIOThread(
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
       base::TickClock* clock) final {
     PacketPipe::InitOnIOThread(task_runner, clock);
     Flip();
   }
 
   void Send(scoped_ptr<Packet> packet) final {
     if (works_) {
-      pipe_->Send(packet.Pass());
+      pipe_->Send(std::move(packet));
     }
   }
 
  private:
   void Flip() {
     works_ = !works_;
     double seconds = base::RandDouble() *
         (works_ ? max_work_time_ : max_outage_time_);
     int64_t microseconds = static_cast<int64_t>(seconds * 1E6);
     task_runner_->PostDelayedTask(
         FROM_HERE,
         base::Bind(&NetworkGlitchPipe::Flip, weak_factory_.GetWeakPtr()),
         base::TimeDelta::FromMicroseconds(microseconds));
   }
 
   bool works_;
   double max_work_time_;
   double max_outage_time_;
   base::WeakPtrFactory<NetworkGlitchPipe> weak_factory_;
 };
 
 scoped_ptr<PacketPipe> NewNetworkGlitchPipe(double average_work_time,
                                             double average_outage_time) {
   return scoped_ptr<PacketPipe>(
-             new NetworkGlitchPipe(average_work_time, average_outage_time))
-      .Pass();
+      new NetworkGlitchPipe(average_work_time, average_outage_time));
 }
 
 
 // Internal buffer object for a client of the IPP model.
 class InterruptedPoissonProcess::InternalBuffer : public PacketPipe {
  public:
   InternalBuffer(base::WeakPtr<InterruptedPoissonProcess> ipp,
                  size_t size)
       : ipp_(ipp),
         stored_size_(0),
@@ skipping 19 matching lines @@
     if (ipp_)
       ipp_->InitOnIOThread(task_runner, clock);
     PacketPipe::InitOnIOThread(task_runner, clock);
   }
 
   void SendOnePacket() {
     scoped_ptr<Packet> packet(buffer_.front().release());
     stored_size_ -= packet->size();
     buffer_.pop_front();
     buffer_time_.pop_front();
-    pipe_->Send(packet.Pass());
+    pipe_->Send(std::move(packet));
     DCHECK(buffer_.size() == buffer_time_.size());
   }
 
   bool Empty() const {
     return buffer_.empty();
   }
 
   base::TimeTicks FirstPacketTime() const {
     DCHECK(!buffer_time_.empty());
     return buffer_time_.front();
@@ skipping 46 matching lines @@
   clock_ = clock;
   UpdateRates();
   SwitchOn();
   SendPacket();
 }
 
 scoped_ptr<PacketPipe> InterruptedPoissonProcess::NewBuffer(size_t size) {
   scoped_ptr<InternalBuffer> buffer(
       new InternalBuffer(weak_factory_.GetWeakPtr(), size));
   send_buffers_.push_back(buffer->GetWeakPtr());
-  return buffer.Pass();
+  return std::move(buffer);
 }
 
 base::TimeDelta InterruptedPoissonProcess::NextEvent(double rate) {
   // Rate is per milliseconds.
   // The time until next event is exponentially distributed to the
   // inverse of |rate|.
   return base::TimeDelta::FromMillisecondsD(
       fabs(-log(1.0 - RandDouble()) / rate));
 }
 
@@ skipping 91 matching lines @@
   void AppendToPipe(scoped_ptr<PacketPipe> pipe) final { NOTREACHED(); }
 
  private:
   UDPProxyImpl* udp_proxy_;
   const net::IPEndPoint* destination_;  // not owned
 };
 
 namespace {
 void BuildPipe(scoped_ptr<PacketPipe>* pipe, PacketPipe* next) {
   if (*pipe) {
-    (*pipe)->AppendToPipe(scoped_ptr<PacketPipe>(next).Pass());
+    (*pipe)->AppendToPipe(scoped_ptr<PacketPipe>(next));
   } else {
     pipe->reset(next);
   }
 }
 }  // namespace
 
 scoped_ptr<PacketPipe> GoodNetwork() {
   // This represents the buffer on the sender.
   scoped_ptr<PacketPipe> pipe;
   BuildPipe(&pipe, new Buffer(2 << 20, 50));
   BuildPipe(&pipe, new ConstantDelay(1E-3));
   BuildPipe(&pipe, new RandomSortedDelay(1E-3, 2E-3, 3));
   // This represents the buffer on the receiving device.
   BuildPipe(&pipe, new Buffer(2 << 20, 50));
-  return pipe.Pass();
+  return pipe;
 }
 
 scoped_ptr<PacketPipe> WifiNetwork() {
   // This represents the buffer on the sender.
   scoped_ptr<PacketPipe> pipe;
   BuildPipe(&pipe, new Buffer(256 << 10, 20));
   BuildPipe(&pipe, new RandomDrop(0.005));
   // This represents the buffer on the router.
   BuildPipe(&pipe, new ConstantDelay(1E-3));
   BuildPipe(&pipe, new RandomSortedDelay(1E-3, 20E-3, 3));
   BuildPipe(&pipe, new Buffer(256 << 10, 20));
   BuildPipe(&pipe, new ConstantDelay(1E-3));
   BuildPipe(&pipe, new RandomSortedDelay(1E-3, 20E-3, 3));
   BuildPipe(&pipe, new RandomDrop(0.005));
   // This represents the buffer on the receiving device.
   BuildPipe(&pipe, new Buffer(256 << 10, 20));
-  return pipe.Pass();
+  return pipe;
 }
 
 scoped_ptr<PacketPipe> BadNetwork() {
   scoped_ptr<PacketPipe> pipe;
   // This represents the buffer on the sender.
   BuildPipe(&pipe, new Buffer(64 << 10, 5)); // 64 kb buf, 5mbit/s
   BuildPipe(&pipe, new RandomDrop(0.05));  // 5% packet drop
   BuildPipe(&pipe, new RandomSortedDelay(2E-3, 20E-3, 1));
   // This represents the buffer on the router.
   BuildPipe(&pipe, new Buffer(64 << 10, 5));  // 64 kb buf, 4mbit/s
   BuildPipe(&pipe, new ConstantDelay(1E-3));
   // Random 40ms every other second
   //  BuildPipe(&pipe, new NetworkGlitchPipe(2, 40E-1));
   BuildPipe(&pipe, new RandomUnsortedDelay(5E-3));
   // This represents the buffer on the receiving device.
   BuildPipe(&pipe, new Buffer(64 << 10, 5));  // 64 kb buf, 5mbit/s
-  return pipe.Pass();
+  return pipe;
 }
 
 
 scoped_ptr<PacketPipe> EvilNetwork() {
   // This represents the buffer on the sender.
   scoped_ptr<PacketPipe> pipe;
   BuildPipe(&pipe, new Buffer(4 << 10, 5));  // 4 kb buf, 2mbit/s
   // This represents the buffer on the router.
   BuildPipe(&pipe, new RandomDrop(0.1));  // 10% packet drop
   BuildPipe(&pipe, new RandomSortedDelay(20E-3, 60E-3, 1));
   BuildPipe(&pipe, new Buffer(4 << 10, 2));  // 4 kb buf, 2mbit/s
   BuildPipe(&pipe, new RandomDrop(0.1));  // 10% packet drop
   BuildPipe(&pipe, new ConstantDelay(1E-3));
   BuildPipe(&pipe, new NetworkGlitchPipe(2.0, 0.3));
   BuildPipe(&pipe, new RandomUnsortedDelay(20E-3));
   // This represents the buffer on the receiving device.
   BuildPipe(&pipe, new Buffer(4 << 10, 2));  // 4 kb buf, 2mbit/s
-  return pipe.Pass();
+  return pipe;
 }
 
 scoped_ptr<InterruptedPoissonProcess> DefaultInterruptedPoissonProcess() {
   // The following values are taken from a session reported from a user.
   // They are experimentally tested to demonstrate challenging network
   // conditions. The average bitrate is about 2mbits/s.
 
   // Each element in this vector is the average number of packets sent
   // per millisecond. The average changes and rotates every second.
   std::vector<double> average_rates;
@@ skipping 13 matching lines @@
   average_rates.push_back(0.980);
   average_rates.push_back(0.781);
   average_rates.push_back(0.463);
 
   const double burstiness = 0.609;
   const double variance = 4.1;
 
   scoped_ptr<InterruptedPoissonProcess> ipp(
       new InterruptedPoissonProcess(
           average_rates, burstiness, variance, 0));
-  return ipp.Pass();
+  return ipp;
 }
 
 class UDPProxyImpl : public UDPProxy {
  public:
   UDPProxyImpl(const net::IPEndPoint& local_port,
                const net::IPEndPoint& destination,
                scoped_ptr<PacketPipe> to_dest_pipe,
                scoped_ptr<PacketPipe> from_dest_pipe,
                net::NetLog* net_log)
       : local_port_(local_port),
         destination_(destination),
         destination_is_mutable_(destination.address().empty()),
         proxy_thread_("media::cast::test::UdpProxy Thread"),
-        to_dest_pipe_(to_dest_pipe.Pass()),
-        from_dest_pipe_(from_dest_pipe.Pass()),
+        to_dest_pipe_(std::move(to_dest_pipe)),
+        from_dest_pipe_(std::move(from_dest_pipe)),
         blocked_(false),
         weak_factory_(this) {
     proxy_thread_.StartWithOptions(
         base::Thread::Options(base::MessageLoop::TYPE_IO, 0));
     base::WaitableEvent start_event(false, false);
     proxy_thread_.task_runner()->PostTask(
         FROM_HERE,
         base::Bind(&UDPProxyImpl::Start,
                    base::Unretained(this),
                    base::Unretained(&start_event),
@@ skipping 82 matching lines @@
       return;
     }
     packet_->resize(len);
     if (destination_is_mutable_ && set_destination_next_ &&
         !(recv_address_ == return_address_) &&
         !(recv_address_ == destination_)) {
       destination_ = recv_address_;
     }
     if (recv_address_ == destination_) {
       set_destination_next_ = false;
-      from_dest_pipe_->Send(packet_.Pass());
+      from_dest_pipe_->Send(std::move(packet_));
     } else {
       set_destination_next_ = true;
       VLOG(1) << "Return address = " << recv_address_.ToString();
       return_address_ = recv_address_;
-      to_dest_pipe_->Send(packet_.Pass());
+      to_dest_pipe_->Send(std::move(packet_));
     }
   }
 
   void ReadCallback(scoped_refptr<net::IOBuffer> recv_buf, int len) {
     ProcessPacket(recv_buf, len);
     PollRead();
   }
 
   void PollRead() {
     while (true) {
@@ skipping 38 matching lines @@
   net::IPEndPoint recv_address_;
   scoped_ptr<Packet> packet_;
 
   // For sending.
   bool blocked_;
 
   base::WeakPtrFactory<UDPProxyImpl> weak_factory_;
 };
 
 void PacketSender::Send(scoped_ptr<Packet> packet) {
-  udp_proxy_->Send(packet.Pass(), *destination_);
+  udp_proxy_->Send(std::move(packet), *destination_);
 }
 
 scoped_ptr<UDPProxy> UDPProxy::Create(
     const net::IPEndPoint& local_port,
     const net::IPEndPoint& destination,
     scoped_ptr<PacketPipe> to_dest_pipe,
     scoped_ptr<PacketPipe> from_dest_pipe,
     net::NetLog* net_log) {
-  scoped_ptr<UDPProxy> ret(new UDPProxyImpl(local_port,
-                                            destination,
-                                            to_dest_pipe.Pass(),
-                                            from_dest_pipe.Pass(),
-                                            net_log));
-  return ret.Pass();
+  scoped_ptr<UDPProxy> ret(
+      new UDPProxyImpl(local_port, destination, std::move(to_dest_pipe),
+                       std::move(from_dest_pipe), net_log));
+  return ret;
 }
 
 }  // namespace test
 }  // namespace cast
 }  // namespace media