Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(98)

Unified Diff: media/cast/test/utility/udp_proxy_main.cc

Issue 1544313002: Convert Pass()→std::move() in //media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cast/test/utility/udp_proxy.cc ('k') | media/cdm/aes_decryptor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/test/utility/udp_proxy_main.cc
diff --git a/media/cast/test/utility/udp_proxy_main.cc b/media/cast/test/utility/udp_proxy_main.cc
index bfa4e481b0cae5350298147336d015a5bd864504..88773007b940bb5d65728b288e4155e9f62caf8b 100644
--- a/media/cast/test/utility/udp_proxy_main.cc
+++ b/media/cast/test/utility/udp_proxy_main.cc
@@ -3,11 +3,11 @@
// found in the LICENSE file.
#include <stdint.h>
-
#include <cstdio>
#include <cstdlib>
#include <deque>
#include <string>
+#include <utility>
#include "base/at_exit.h"
#include "base/bind.h"
@@ -81,7 +81,7 @@ class ByteCounterPipe : public media::cast::test::PacketPipe {
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_;
@@ -92,10 +92,9 @@ void SetupByteCounters(scoped_ptr<media::cast::test::PacketPipe>* pipe,
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);
}
@@ -173,17 +172,17 @@ int main(int argc, char** argv) {
if (network_type == "perfect") {
// No action needed.
} 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 if (network_type == "poisson-wifi") {
- in_pipe = ipp->NewBuffer(128 * 1024).Pass();
- out_pipe = ipp->NewBuffer(128 * 1024).Pass();
+ in_pipe = ipp->NewBuffer(128 * 1024);
+ out_pipe = ipp->NewBuffer(128 * 1024);
} else {
fprintf(stderr, "Unknown network type.\n");
exit(1);
@@ -197,11 +196,9 @@ int main(int argc, char** argv) {
printf("Press Ctrl-C when done.\n");
scoped_ptr<media::cast::test::UDPProxy> proxy(
- media::cast::test::UDPProxy::Create(local_endpoint,
- remote_endpoint,
- in_pipe.Pass(),
- out_pipe.Pass(),
- NULL));
+ media::cast::test::UDPProxy::Create(local_endpoint, remote_endpoint,
+ std::move(in_pipe),
+ std::move(out_pipe), NULL));
base::MessageLoop message_loop;
g_counter.Get().last_printout = base::TimeTicks::Now();
CheckByteCounters();
« no previous file with comments | « media/cast/test/utility/udp_proxy.cc ('k') | media/cdm/aes_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698