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

Side by Side Diff: media/midi/midi_manager_alsa_unittest.cc

Issue 1915443003: Replace scoped_ptr with std::unique_ptr in //media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptr-media-base
Patch Set: scopedptr-media: rebase Created 4 years, 7 months 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 unified diff | Download patch
« no previous file with comments | « media/midi/midi_manager_alsa.cc ('k') | media/midi/midi_manager_android.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/midi/midi_manager_alsa.h" 5 #include "media/midi/midi_manager_alsa.h"
6 6
7 #include <memory>
7 #include <utility> 8 #include <utility>
8 9
9 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
10 11
11 namespace media { 12 namespace media {
12 namespace midi { 13 namespace midi {
13 14
14 class MidiManagerAlsaTest : public ::testing::Test { 15 class MidiManagerAlsaTest : public ::testing::Test {
15 protected: 16 protected:
16 void SetUp() override { 17 void SetUp() override {
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 } 117 }
117 118
118 // Counts ports for help with testing ToMidiPortState(). 119 // Counts ports for help with testing ToMidiPortState().
119 int CountPorts(MidiManagerAlsa::TemporaryMidiPortState& state) { 120 int CountPorts(MidiManagerAlsa::TemporaryMidiPortState& state) {
120 int count = 0; 121 int count = 0;
121 for (auto it = state.begin(); it != state.end(); ++it) 122 for (auto it = state.begin(); it != state.end(); ++it)
122 ++count; 123 ++count;
123 return count; 124 return count;
124 } 125 }
125 126
126 scoped_ptr<MidiManagerAlsa::MidiPort> port_input_0_; 127 std::unique_ptr<MidiManagerAlsa::MidiPort> port_input_0_;
127 scoped_ptr<MidiManagerAlsa::MidiPort> port_input_1_; 128 std::unique_ptr<MidiManagerAlsa::MidiPort> port_input_1_;
128 scoped_ptr<MidiManagerAlsa::MidiPort> port_input_minimal_; 129 std::unique_ptr<MidiManagerAlsa::MidiPort> port_input_minimal_;
129 scoped_ptr<MidiManagerAlsa::MidiPort> port_output_0_; 130 std::unique_ptr<MidiManagerAlsa::MidiPort> port_output_0_;
130 scoped_ptr<MidiManagerAlsa::MidiPort> port_output_1_; 131 std::unique_ptr<MidiManagerAlsa::MidiPort> port_output_1_;
131 132
132 scoped_ptr<MidiManagerAlsa::MidiPort> port_input_0_alt_path_; 133 std::unique_ptr<MidiManagerAlsa::MidiPort> port_input_0_alt_path_;
133 scoped_ptr<MidiManagerAlsa::MidiPort> port_input_0_alt_id_; 134 std::unique_ptr<MidiManagerAlsa::MidiPort> port_input_0_alt_id_;
134 scoped_ptr<MidiManagerAlsa::MidiPort> port_input_0_alt_client_name_; 135 std::unique_ptr<MidiManagerAlsa::MidiPort> port_input_0_alt_client_name_;
135 scoped_ptr<MidiManagerAlsa::MidiPort> port_input_0_alt_port_name_; 136 std::unique_ptr<MidiManagerAlsa::MidiPort> port_input_0_alt_port_name_;
136 scoped_ptr<MidiManagerAlsa::MidiPort> port_input_0_alt_client_id_; 137 std::unique_ptr<MidiManagerAlsa::MidiPort> port_input_0_alt_client_id_;
137 scoped_ptr<MidiManagerAlsa::MidiPort> port_input_0_alt_port_id_; 138 std::unique_ptr<MidiManagerAlsa::MidiPort> port_input_0_alt_port_id_;
138 scoped_ptr<MidiManagerAlsa::MidiPort> port_input_0_alt_midi_device_; 139 std::unique_ptr<MidiManagerAlsa::MidiPort> port_input_0_alt_midi_device_;
139 140
140 scoped_ptr<MidiManagerAlsa::MidiPort> port_input_0_no_card_; 141 std::unique_ptr<MidiManagerAlsa::MidiPort> port_input_0_no_card_;
141 scoped_ptr<MidiManagerAlsa::MidiPort> port_input_1_no_card_; 142 std::unique_ptr<MidiManagerAlsa::MidiPort> port_input_1_no_card_;
142 scoped_ptr<MidiManagerAlsa::MidiPort> port_output_0_no_card_; 143 std::unique_ptr<MidiManagerAlsa::MidiPort> port_output_0_no_card_;
143 144
144 scoped_ptr<MidiManagerAlsa::MidiPort> port_input_0_no_card_alt_client_name_; 145 std::unique_ptr<MidiManagerAlsa::MidiPort>
145 scoped_ptr<MidiManagerAlsa::MidiPort> port_input_0_no_card_alt_port_name_; 146 port_input_0_no_card_alt_client_name_;
146 scoped_ptr<MidiManagerAlsa::MidiPort> port_input_0_no_card_alt_client_id_; 147 std::unique_ptr<MidiManagerAlsa::MidiPort>
147 scoped_ptr<MidiManagerAlsa::MidiPort> port_input_0_no_card_alt_port_id_; 148 port_input_0_no_card_alt_port_name_;
149 std::unique_ptr<MidiManagerAlsa::MidiPort>
150 port_input_0_no_card_alt_client_id_;
151 std::unique_ptr<MidiManagerAlsa::MidiPort> port_input_0_no_card_alt_port_id_;
148 152
149 // State fields to avoid declaring in test fixtures below. 153 // State fields to avoid declaring in test fixtures below.
150 MidiManagerAlsa::MidiPortState midi_port_state_0_; 154 MidiManagerAlsa::MidiPortState midi_port_state_0_;
151 MidiManagerAlsa::MidiPortState midi_port_state_1_; 155 MidiManagerAlsa::MidiPortState midi_port_state_1_;
152 MidiManagerAlsa::TemporaryMidiPortState temporary_midi_port_state_0_; 156 MidiManagerAlsa::TemporaryMidiPortState temporary_midi_port_state_0_;
153 MidiManagerAlsa::AlsaSeqState alsa_seq_state_0_; 157 MidiManagerAlsa::AlsaSeqState alsa_seq_state_0_;
154 MidiManagerAlsa::AlsaCardMap alsa_cards_; 158 MidiManagerAlsa::AlsaCardMap alsa_cards_;
155 }; 159 };
156 160
157 // Tests that ExtractManufacturerString works as expected. 161 // Tests that ExtractManufacturerString works as expected.
(...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after
696 } 700 }
697 701
698 TEST_F(MidiManagerAlsaTest, AlsaCards) { 702 TEST_F(MidiManagerAlsaTest, AlsaCards) {
699 // TODO(agoode): test add/remove of alsa cards. 703 // TODO(agoode): test add/remove of alsa cards.
700 } 704 }
701 705
702 // TODO(agoode): Test old -> new state event generation, using mocks. 706 // TODO(agoode): Test old -> new state event generation, using mocks.
703 707
704 } // namespace midi 708 } // namespace midi
705 } // namespace media 709 } // namespace media
OLDNEW
« no previous file with comments | « media/midi/midi_manager_alsa.cc ('k') | media/midi/midi_manager_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698