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

media/midi/midi_manager_alsa_unittest.cc

 // Copyright 2015 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/midi/midi_manager_alsa.h"
 
+#include <utility>
+
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 namespace midi {
 
 class MidiManagerAlsaTest : public ::testing::Test {
  protected:
   void SetUp() override {
     // Pre-instantiate typical MidiPort instances that are often used in
     // following tests.
@@ skipping 352 matching lines @@
 TEST_F(MidiManagerAlsaTest, PortIndexSet) {
   auto* port_input_0_tracking_pointer = port_input_0_.get();
   auto* port_output_0_tracking_pointer = port_output_0_.get();
   auto* port_input_1_tracking_pointer = port_input_1_.get();
   auto* port_output_1_tracking_pointer = port_input_1_.get();
 
   // Explicitly initialize web_port_index.
   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());
   EXPECT_EQ(0U, port_output_0_tracking_pointer->web_port_index());
   // Second port of each type has index of 1.
   EXPECT_EQ(1U, port_input_1_tracking_pointer->web_port_index());
   EXPECT_EQ(1U, port_output_1_tracking_pointer->web_port_index());
 }
 
 // Tests that the web_port_index is not updated by TemporaryMidiPortState.
 TEST_F(MidiManagerAlsaTest, PortIndexNotSet) {
   auto* port_input_0_tracking_pointer = port_input_0_.get();
   auto* port_output_0_tracking_pointer = port_output_0_.get();
   auto* port_input_1_tracking_pointer = port_input_1_.get();
   auto* port_output_1_tracking_pointer = port_input_1_.get();
 
   // Explicitly initialize web_port_index.
   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());
   EXPECT_EQ(0U, port_output_0_tracking_pointer->web_port_index());
   EXPECT_EQ(5000U, port_input_1_tracking_pointer->web_port_index());
   EXPECT_EQ(5000U, port_output_1_tracking_pointer->web_port_index());
 }
 
 // Tests that inputs and outputs stay separate in MidiPortState.
 TEST_F(MidiManagerAlsaTest, SeparateInputOutput) {
   auto* port_input_0_tracking_pointer = port_input_0_.get();
   auto* port_output_0_tracking_pointer = port_output_0_.get();
   auto* port_input_1_tracking_pointer = port_input_1_.get();
   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());
   EXPECT_EQ(0U, port_output_0_tracking_pointer->web_port_index());
   EXPECT_EQ(1U, port_input_1_tracking_pointer->web_port_index());
   EXPECT_EQ(1U, port_output_1_tracking_pointer->web_port_index());
 }
 
 // Tests FindConnected.
 TEST_F(MidiManagerAlsaTest, FindConnected) {
   auto* port_input_0_tracking_pointer = port_input_0_.get();
   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());
   // Look for something else that we won't find.
   EXPECT_EQ(midi_port_state_0_.end(),
             midi_port_state_0_.FindConnected(*port_input_0_alt_path_));
 }
 
 TEST_F(MidiManagerAlsaTest, FindConnected2) {
   auto* port_input_0_tracking_pointer = port_input_0_.get();
   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());
   // Look for something else that we won't find.
   EXPECT_EQ(midi_port_state_0_.end(),
             midi_port_state_0_.FindConnected(*port_input_minimal_));
 }
 
 TEST_F(MidiManagerAlsaTest, FindConnected3) {
   // midi_port_state_0_ is empty to start.
@@ skipping 12 matching lines @@
   auto* port_input_0_tracking_pointer = port_input_0_.get();
   auto* port_input_1_tracking_pointer = port_input_1_.get();
   auto* port_input_1_no_card_tracking_pointer = port_input_1_no_card_.get();
 
   // Ports need to be disconnected to find them.
   port_input_0_alt_id_->set_connected(false);
   port_input_0_alt_path_->set_connected(false);
   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,
             midi_port_state_0_.FindDisconnected(*port_input_1_tracking_pointer)
                 ->get());
 
   // Look for no card exact match.
   EXPECT_EQ(
       port_input_1_no_card_tracking_pointer,
       midi_port_state_0_.FindDisconnected(*port_input_0_no_card_.get())->get());
 
   // Look for something else that we won't find.
   EXPECT_EQ(midi_port_state_0_.end(),
             midi_port_state_0_.FindDisconnected(*port_input_minimal_));
 }
 
 TEST_F(MidiManagerAlsaTest, FindDisconnected3) {
   auto* port_input_0_tracking_pointer = port_input_0_.get();
   auto* port_input_0_alt_path_tracking_pointer = port_input_0_alt_path_.get();
   auto* port_input_1_no_card_tracking_pointer = port_input_1_no_card_.get();
 
   // Ports need to be disconnected to find them.
   port_input_0_alt_path_->set_connected(false);
   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,
             midi_port_state_0_.FindDisconnected(*port_input_0_tracking_pointer)
                 ->get());
 
   // Look for no card partial match.
   EXPECT_EQ(port_input_1_no_card_tracking_pointer,
             midi_port_state_0_.FindDisconnected(
                                   *port_input_0_no_card_alt_client_id_.get())
@@ skipping 145 matching lines @@
 }
 
 TEST_F(MidiManagerAlsaTest, AlsaCards) {
   // TODO(agoode): test add/remove of alsa cards.
 }
 
 // TODO(agoode): Test old -> new state event generation, using mocks.
 
 }  // namespace midi
 }  // namespace media