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

Unified Diff: media/midi/midi_manager_usb_unittest.cc

Issue 643093003: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: media/midi/midi_manager_usb_unittest.cc
diff --git a/media/midi/midi_manager_usb_unittest.cc b/media/midi/midi_manager_usb_unittest.cc
index dda6775af3652a785920f17c916154c271ecd5b4..716be48dfb68727143d01243567dcbabda817993 100644
--- a/media/midi/midi_manager_usb_unittest.cc
+++ b/media/midi/midi_manager_usb_unittest.cc
@@ -130,7 +130,7 @@ class MidiManagerUsbForTesting : public MidiManagerUsb {
public:
explicit MidiManagerUsbForTesting(
scoped_ptr<UsbMidiDevice::Factory> device_factory)
- : MidiManagerUsb(device_factory.PassAs<UsbMidiDevice::Factory>()) {}
+ : MidiManagerUsb(device_factory.Pass()) {}
virtual ~MidiManagerUsbForTesting() {}
void CallCompleteInitialization(MidiResult result) {
@@ -148,8 +148,7 @@ class MidiManagerUsbTest : public ::testing::Test {
MidiManagerUsbTest() : message_loop_(new base::MessageLoop) {
scoped_ptr<TestUsbMidiDeviceFactory> factory(new TestUsbMidiDeviceFactory);
factory_ = factory.get();
- manager_.reset(
- new MidiManagerUsbForTesting(factory.PassAs<UsbMidiDevice::Factory>()));
+ manager_.reset(new MidiManagerUsbForTesting(factory.Pass()));
}
virtual ~MidiManagerUsbTest() {
std::string leftover_logs = logger_.TakeLog();
« no previous file with comments | « media/filters/pipeline_integration_test_base.cc ('k') | media/video/capture/fake_video_capture_device_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698