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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/midi/midi_manager_alsa_unittest.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/midi/midi_manager_alsa.cc ('k') | media/midi/midi_manager_usb.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/midi/midi_manager_alsa_unittest.cc
diff --git a/media/midi/midi_manager_alsa_unittest.cc b/media/midi/midi_manager_alsa_unittest.cc
index 4c91625cdce9dc5174ab48e0977e4898add555fa..d5aee86721cc9c6175b38b53e60e08098d729671 100644
--- a/media/midi/midi_manager_alsa_unittest.cc
+++ b/media/midi/midi_manager_alsa_unittest.cc
@@ -4,6 +4,8 @@
#include "media/midi/midi_manager_alsa.h"
+#include <utility>
+
#include "testing/gtest/include/gtest/gtest.h"
namespace media {
@@ -376,10 +378,10 @@ TEST_F(MidiManagerAlsaTest, PortIndexSet) {
port_input_1_->set_web_port_index(5000);
port_output_1_->set_web_port_index(5000);
- midi_port_state_0_.push_back(port_input_0_.Pass());
- midi_port_state_0_.push_back(port_output_0_.Pass());
- midi_port_state_0_.push_back(port_input_1_.Pass());
- midi_port_state_0_.push_back(port_output_1_.Pass());
+ midi_port_state_0_.push_back(std::move(port_input_0_));
+ midi_port_state_0_.push_back(std::move(port_output_0_));
+ midi_port_state_0_.push_back(std::move(port_input_1_));
+ midi_port_state_0_.push_back(std::move(port_output_1_));
// First port of each type has index of 0.
EXPECT_EQ(0U, port_input_0_tracking_pointer->web_port_index());
@@ -400,10 +402,10 @@ TEST_F(MidiManagerAlsaTest, PortIndexNotSet) {
port_input_1_->set_web_port_index(5000);
port_output_1_->set_web_port_index(5000);
- temporary_midi_port_state_0_.push_back(port_input_0_.Pass());
- temporary_midi_port_state_0_.push_back(port_output_0_.Pass());
- temporary_midi_port_state_0_.push_back(port_input_1_.Pass());
- temporary_midi_port_state_0_.push_back(port_output_1_.Pass());
+ temporary_midi_port_state_0_.push_back(std::move(port_input_0_));
+ temporary_midi_port_state_0_.push_back(std::move(port_output_0_));
+ temporary_midi_port_state_0_.push_back(std::move(port_input_1_));
+ temporary_midi_port_state_0_.push_back(std::move(port_output_1_));
// web_port_index is untouched.
EXPECT_EQ(0U, port_input_0_tracking_pointer->web_port_index());
@@ -420,12 +422,12 @@ TEST_F(MidiManagerAlsaTest, SeparateInputOutput) {
auto* port_output_1_tracking_pointer = port_input_1_.get();
// First port of each type has index of 0.
- EXPECT_EQ(0U, midi_port_state_0_.push_back(port_input_0_.Pass()));
- EXPECT_EQ(0U, midi_port_state_0_.push_back(port_output_0_.Pass()));
+ EXPECT_EQ(0U, midi_port_state_0_.push_back(std::move(port_input_0_)));
+ EXPECT_EQ(0U, midi_port_state_0_.push_back(std::move(port_output_0_)));
// Second port of each type has index of 1.
- EXPECT_EQ(1U, midi_port_state_0_.push_back(port_input_1_.Pass()));
- EXPECT_EQ(1U, midi_port_state_0_.push_back(port_output_1_.Pass()));
+ EXPECT_EQ(1U, midi_port_state_0_.push_back(std::move(port_input_1_)));
+ EXPECT_EQ(1U, midi_port_state_0_.push_back(std::move(port_output_1_)));
// Check again that the field matches what was returned.
EXPECT_EQ(0U, port_input_0_tracking_pointer->web_port_index());
@@ -440,7 +442,7 @@ TEST_F(MidiManagerAlsaTest, FindConnected) {
auto* port_input_1_tracking_pointer = port_input_1_.get();
// Insert port_input_0.
- midi_port_state_0_.push_back(port_input_0_.Pass());
+ midi_port_state_0_.push_back(std::move(port_input_0_));
// Look for port_input_1 (every field matches port_input_0).
auto it = midi_port_state_0_.FindConnected(*port_input_1_tracking_pointer);
EXPECT_EQ(port_input_0_tracking_pointer, it->get());
@@ -454,13 +456,13 @@ TEST_F(MidiManagerAlsaTest, FindConnected2) {
auto* port_input_1_tracking_pointer = port_input_1_.get();
// Insert some stuff.
- midi_port_state_0_.push_back(port_input_0_alt_path_.Pass());
- midi_port_state_0_.push_back(port_input_0_alt_id_.Pass());
- midi_port_state_0_.push_back(port_input_0_alt_client_name_.Pass());
+ midi_port_state_0_.push_back(std::move(port_input_0_alt_path_));
+ midi_port_state_0_.push_back(std::move(port_input_0_alt_id_));
+ midi_port_state_0_.push_back(std::move(port_input_0_alt_client_name_));
// Insert port_input_0.
- midi_port_state_0_.push_back(port_input_0_.Pass());
+ midi_port_state_0_.push_back(std::move(port_input_0_));
// Insert some more stuff.
- midi_port_state_0_.push_back(port_input_0_alt_port_id_.Pass());
+ midi_port_state_0_.push_back(std::move(port_input_0_alt_port_id_));
// Look for port_input_1 (matches to port_input_0).
auto it = midi_port_state_0_.FindConnected(*port_input_1_tracking_pointer);
EXPECT_EQ(port_input_0_tracking_pointer, it->get());
@@ -493,17 +495,17 @@ TEST_F(MidiManagerAlsaTest, FindDisconnected2) {
port_input_0_->set_connected(false);
// Insert some stuff.
- midi_port_state_0_.push_back(port_input_0_alt_id_.Pass());
- midi_port_state_0_.push_back(port_input_0_alt_path_.Pass());
+ midi_port_state_0_.push_back(std::move(port_input_0_alt_id_));
+ midi_port_state_0_.push_back(std::move(port_input_0_alt_path_));
// Insert port_input_0.
- midi_port_state_0_.push_back(port_input_0_.Pass());
+ midi_port_state_0_.push_back(std::move(port_input_0_));
// Add "no card" stuff.
port_input_1_no_card_->set_connected(false);
- midi_port_state_0_.push_back(port_input_1_no_card_.Pass());
+ midi_port_state_0_.push_back(std::move(port_input_1_no_card_));
// Insert some more stuff.
- midi_port_state_0_.push_back(port_input_0_alt_port_id_.Pass());
+ midi_port_state_0_.push_back(std::move(port_input_0_alt_port_id_));
// Look for port_input_1, should trigger exact match.
EXPECT_EQ(port_input_0_tracking_pointer,
@@ -530,12 +532,12 @@ TEST_F(MidiManagerAlsaTest, FindDisconnected3) {
port_input_0_->set_connected(false);
// Insert some stuff.
- midi_port_state_0_.push_back(port_input_0_alt_path_.Pass());
- midi_port_state_0_.push_back(port_input_0_alt_id_.Pass());
+ midi_port_state_0_.push_back(std::move(port_input_0_alt_path_));
+ midi_port_state_0_.push_back(std::move(port_input_0_alt_id_));
// Add no card stuff.
port_input_1_no_card_->set_connected(false);
- midi_port_state_0_.push_back(port_input_1_no_card_.Pass());
+ midi_port_state_0_.push_back(std::move(port_input_1_no_card_));
// Look for port_input_0, should find port_input_0_alt_path.
EXPECT_EQ(port_input_0_alt_path_tracking_pointer,
« no previous file with comments | « media/midi/midi_manager_alsa.cc ('k') | media/midi/midi_manager_usb.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698