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

media/cast/test/utility/tap_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 <errno.h>
 #include <fcntl.h>
 #include <linux/if_tun.h>
 #include <linux/types.h>
 #include <math.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-
 #include <deque>
 #include <map>
+#include <utility>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
@@ skipping 30 matching lines @@
       }
       break;
     }
   }
  private:
   int fd_;
 };
 
 class QueueManager : public base::MessageLoopForIO::Watcher {
  public:
-  QueueManager(int input_fd,
-               int output_fd,
-               scoped_ptr<PacketPipe> pipe) :
-      input_fd_(input_fd),
-      packet_pipe_(pipe.Pass()) {
-
+  QueueManager(int input_fd, int output_fd, scoped_ptr<PacketPipe> pipe)
+      : input_fd_(input_fd), packet_pipe_(std::move(pipe)) {
     CHECK(base::MessageLoopForIO::current()->WatchFileDescriptor(
         input_fd_, true, base::MessageLoopForIO::WATCH_READ,
         &read_socket_watcher_, this));
 
     scoped_ptr<PacketPipe> tmp(new SendToFDPipe(output_fd));
     if (packet_pipe_) {
-      packet_pipe_->AppendToPipe(tmp.Pass());
+      packet_pipe_->AppendToPipe(std::move(tmp));
     } else {
-      packet_pipe_ = tmp.Pass();
+      packet_pipe_ = std::move(tmp);
     }
     packet_pipe_->InitOnIOThread(base::ThreadTaskRunnerHandle::Get(),
                                  &tick_clock_);
   }
 
   ~QueueManager() final {}
 
   // MessageLoopForIO::Watcher methods
   void OnFileCanReadWithoutBlocking(int fd) final {
     scoped_ptr<Packet> packet(new Packet(kMaxPacketSize));
     int nread = read(input_fd_,
                      reinterpret_cast<char*>(&packet->front()),
                      kMaxPacketSize);
     if (nread < 0) {
       if (errno == EINTR) return;
       perror("read");
       exit(1);
     }
     if (nread == 0) return;
     packet->resize(nread);
-    packet_pipe_->Send(packet.Pass());
+    packet_pipe_->Send(std::move(packet));
   }
   void OnFileCanWriteWithoutBlocking(int fd) final { NOTREACHED(); }
 
  private:
   int input_fd_;
   scoped_ptr<PacketPipe> packet_pipe_;
   base::MessageLoopForIO::FileDescriptorWatcher read_socket_watcher_;
   base::DefaultTickClock tick_clock_;
 };
 
@@ skipping 50 matching lines @@
 ByteCounter in_pipe_input_counter;
 ByteCounter in_pipe_output_counter;
 ByteCounter out_pipe_input_counter;
 ByteCounter out_pipe_output_counter;
 
 class ByteCounterPipe : public media::cast::test::PacketPipe {
  public:
   ByteCounterPipe(ByteCounter* counter) : counter_(counter) {}
   void Send(scoped_ptr<media::cast::Packet> packet) final {
     counter_->Increment(packet->size());
-    pipe_->Send(packet.Pass());
+    pipe_->Send(std::move(packet));
   }
  private:
   ByteCounter* counter_;
 };
 
 void SetupByteCounters(scoped_ptr<media::cast::test::PacketPipe>* pipe,
                        ByteCounter* pipe_input_counter,
                        ByteCounter* pipe_output_counter) {
   media::cast::test::PacketPipe* new_pipe =
       new ByteCounterPipe(pipe_input_counter);
-  new_pipe->AppendToPipe(pipe->Pass());
-  new_pipe->AppendToPipe(
-      scoped_ptr<media::cast::test::PacketPipe>(
-          new ByteCounterPipe(pipe_output_counter)).Pass());
+  new_pipe->AppendToPipe(std::move(*pipe));
+  new_pipe->AppendToPipe(scoped_ptr<media::cast::test::PacketPipe>(
+      new ByteCounterPipe(pipe_output_counter)));
   pipe->reset(new_pipe);
 }
 
 void CheckByteCounters() {
   base::TimeTicks now = base::TimeTicks::Now();
   in_pipe_input_counter.push(now);
   in_pipe_output_counter.push(now);
   out_pipe_input_counter.push(now);
   out_pipe_output_counter.push(now);
   if ((now - last_printout).InSeconds() >= 5) {
@@ skipping 75 matching lines @@
     fprintf(stderr,
             "Where 'type' is one of perfect, good, wifi, bad or evil\n");
     exit(1);
   }
 
   scoped_ptr<media::cast::test::PacketPipe> in_pipe, out_pipe;
   std::string network_type = argv[3];
   if (network_type == "perfect") {
     // No action needed.
   } else if (network_type == "good") {
-    in_pipe = media::cast::test::GoodNetwork().Pass();
-    out_pipe = media::cast::test::GoodNetwork().Pass();
+    in_pipe = media::cast::test::GoodNetwork();
+    out_pipe = media::cast::test::GoodNetwork();
   } else if (network_type == "wifi") {
-    in_pipe = media::cast::test::WifiNetwork().Pass();
-    out_pipe = media::cast::test::WifiNetwork().Pass();
+    in_pipe = media::cast::test::WifiNetwork();
+    out_pipe = media::cast::test::WifiNetwork();
   } else if (network_type == "bad") {
-    in_pipe = media::cast::test::BadNetwork().Pass();
-    out_pipe = media::cast::test::BadNetwork().Pass();
+    in_pipe = media::cast::test::BadNetwork();
+    out_pipe = media::cast::test::BadNetwork();
   } else if (network_type == "evil") {
-    in_pipe = media::cast::test::EvilNetwork().Pass();
-    out_pipe = media::cast::test::EvilNetwork().Pass();
+    in_pipe = media::cast::test::EvilNetwork();
+    out_pipe = media::cast::test::EvilNetwork();
   } else {
     fprintf(stderr, "Unknown network type.\n");
     exit(1);
   }
 
   SetupByteCounters(&in_pipe, &in_pipe_input_counter, &in_pipe_output_counter);
   SetupByteCounters(
       &out_pipe, &out_pipe_input_counter, &out_pipe_output_counter);
 
   int fd1 = tun_alloc(argv[1], IFF_TAP);
   int fd2 = tun_alloc(argv[2], IFF_TAP);
 
   base::MessageLoopForIO message_loop;
   last_printout = base::TimeTicks::Now();
-  media::cast::test::QueueManager qm1(fd1, fd2, in_pipe.Pass());
-  media::cast::test::QueueManager qm2(fd2, fd1, out_pipe.Pass());
+  media::cast::test::QueueManager qm1(fd1, fd2, std::move(in_pipe));
+  media::cast::test::QueueManager qm2(fd2, fd1, std::move(out_pipe));
   CheckByteCounters();
   printf("Press Ctrl-C when done.\n");
   message_loop.Run();
 }