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

Unified Diff: media/midi/midi_manager_usb.cc

Issue 2893953002: Revert of Remove ScopedVector from all other codes in media/ (Closed)
Patch Set: Created 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/midi/midi_manager_usb.h ('k') | media/midi/midi_manager_usb_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/midi/midi_manager_usb.cc
diff --git a/media/midi/midi_manager_usb.cc b/media/midi/midi_manager_usb.cc
index f5fdc00558766fba286c03dc9b7af4030fc16bca..56e08c8d52ba0beb3c06e9299c70bb9b09e69731 100644
--- a/media/midi/midi_manager_usb.cc
+++ b/media/midi/midi_manager_usb.cc
@@ -7,7 +7,6 @@
#include <utility>
#include "base/logging.h"
-#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/stringprintf.h"
#include "media/midi/midi_scheduler.h"
@@ -68,7 +67,7 @@
scheduler_->PostSendDataTask(
client, data.size(), timestamp,
base::Bind(&UsbMidiOutputStream::Send,
- base::Unretained(output_streams_[port_index].get()), data));
+ base::Unretained(output_streams_[port_index]), data));
}
void MidiManagerUsb::ReceiveUsbMidiData(UsbMidiDevice* device,
@@ -88,14 +87,14 @@
void MidiManagerUsb::OnDeviceAttached(std::unique_ptr<UsbMidiDevice> device) {
int device_id = static_cast<int>(devices_.size());
devices_.push_back(std::move(device));
- AddPorts(devices_.back().get(), device_id);
+ AddPorts(devices_.back(), device_id);
}
void MidiManagerUsb::OnDeviceDetached(size_t index) {
if (index >= devices_.size()) {
return;
}
- UsbMidiDevice* device = devices_[index].get();
+ UsbMidiDevice* device = devices_[index];
for (size_t i = 0; i < output_streams_.size(); ++i) {
if (output_streams_[i]->jack().device == device) {
SetOutputPortState(static_cast<uint32_t>(i), PortState::DISCONNECTED);
@@ -126,7 +125,7 @@
input_stream_.reset(new UsbMidiInputStream(this));
devices->swap(devices_);
for (size_t i = 0; i < devices_.size(); ++i) {
- if (!AddPorts(devices_[i].get(), static_cast<int>(i))) {
+ if (!AddPorts(devices_[i], static_cast<int>(i))) {
initialize_callback_.Run(Result::INITIALIZATION_ERROR);
return;
}
@@ -157,8 +156,7 @@
std::string id(
base::StringPrintf("usb:port-%d-%ld", device_id, static_cast<long>(j)));
if (jacks[j].direction() == UsbMidiJack::DIRECTION_OUT) {
- output_streams_.push_back(
- base::MakeUnique<UsbMidiOutputStream>(jacks[j]));
+ output_streams_.push_back(new UsbMidiOutputStream(jacks[j]));
AddOutputPort(MidiPortInfo(id, manufacturer, product_name, version,
PortState::OPENED));
} else {
« no previous file with comments | « media/midi/midi_manager_usb.h ('k') | media/midi/midi_manager_usb_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698