Index: media/midi/midi_manager_win.cc |
diff --git a/media/midi/midi_manager_win.cc b/media/midi/midi_manager_win.cc |
index ebf4139813a62fedf942cb1d8c458aa37fecb4f0..c58c799592b37726c0137def760346d407b5797d 100644 |
--- a/media/midi/midi_manager_win.cc |
+++ b/media/midi/midi_manager_win.cc |
@@ -30,6 +30,7 @@ |
#include "base/containers/hash_tables.h" |
#include "base/macros.h" |
#include "base/message_loop/message_loop.h" |
+#include "base/single_thread_task_runner.h" |
#include "base/strings/string16.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/strings/string_piece.h" |
@@ -501,7 +502,7 @@ class MidiServiceWinImpl : public MidiServiceWin, |
UpdateDeviceList(); |
- task_thread_.message_loop()->PostTask( |
+ task_thread_.task_runner()->PostTask( |
FROM_HERE, |
base::Bind(&MidiServiceWinImpl::CompleteInitializationOnTaskThread, |
base::Unretained(this), Result::OK)); |
@@ -529,13 +530,13 @@ class MidiServiceWinImpl : public MidiServiceWin, |
} |
const auto now = base::TimeTicks::Now(); |
if (now < time) { |
- sender_thread_.message_loop()->PostDelayedTask( |
+ sender_thread_.task_runner()->PostDelayedTask( |
FROM_HERE, base::Bind(&MidiServiceWinImpl::SendOnSenderThread, |
base::Unretained(this), port_number, |
state->port_age, data, time), |
time - now); |
} else { |
- sender_thread_.message_loop()->PostTask( |
+ sender_thread_.task_runner()->PostTask( |
FROM_HERE, base::Bind(&MidiServiceWinImpl::SendOnSenderThread, |
base::Unretained(this), port_number, |
state->port_age, data, time)); |
@@ -585,7 +586,7 @@ class MidiServiceWinImpl : public MidiServiceWin, |
} |
void UpdateDeviceList() { |
- task_thread_.message_loop()->PostTask( |
+ task_thread_.task_runner()->PostTask( |
FROM_HERE, base::Bind(&MidiServiceWinImpl::UpdateDeviceListOnTaskThread, |
base::Unretained(this))); |
} |
@@ -665,7 +666,7 @@ class MidiServiceWinImpl : public MidiServiceWin, |
input_ports_[port_number]->port_age = input_ports_ages_[port_number]; |
} |
// Several initial startup tasks cannot be done in MIM_OPEN handler. |
- task_thread_.message_loop()->PostTask( |
+ task_thread_.task_runner()->PostTask( |
FROM_HERE, base::Bind(&MidiServiceWinImpl::StartInputDeviceOnTaskThread, |
base::Unretained(this), midi_in_handle)); |
if (add_new_port) { |
@@ -676,11 +677,11 @@ class MidiServiceWinImpl : public MidiServiceWin, |
base::WideToUTF8(state_device_info.product_name), |
MmversionToString(state_device_info.driver_version), |
MIDI_PORT_OPENED); |
- task_thread_.message_loop()->PostTask( |
+ task_thread_.task_runner()->PostTask( |
FROM_HERE, base::Bind(&MidiServiceWinImpl::AddInputPortOnTaskThread, |
base::Unretained(this), port_info)); |
} else { |
- task_thread_.message_loop()->PostTask( |
+ task_thread_.task_runner()->PostTask( |
FROM_HERE, |
base::Bind(&MidiServiceWinImpl::SetInputPortStateOnTaskThread, |
base::Unretained(this), port_number, |
@@ -710,7 +711,7 @@ class MidiServiceWinImpl : public MidiServiceWin, |
// http://msdn.microsoft.com/en-us/library/windows/desktop/dd757286.aspx |
const base::TimeTicks event_time = |
state->start_time + base::TimeDelta::FromMilliseconds(elapsed_ms); |
- task_thread_.message_loop()->PostTask( |
+ task_thread_.task_runner()->PostTask( |
FROM_HERE, base::Bind(&MidiServiceWinImpl::ReceiveMidiDataOnTaskThread, |
base::Unretained(this), state->port_index, data, |
event_time)); |
@@ -747,7 +748,7 @@ class MidiServiceWinImpl : public MidiServiceWin, |
// http://msdn.microsoft.com/en-us/library/windows/desktop/dd757286.aspx |
const base::TimeTicks event_time = |
state->start_time + base::TimeDelta::FromMilliseconds(elapsed_ms); |
- task_thread_.message_loop()->PostTask( |
+ task_thread_.task_runner()->PostTask( |
FROM_HERE, |
base::Bind(&MidiServiceWinImpl::ReceiveMidiDataOnTaskThread, |
base::Unretained(this), state->port_index, data, |
@@ -772,7 +773,7 @@ class MidiServiceWinImpl : public MidiServiceWin, |
input_ports_ages_[port_number] += 1; |
unused_input_ports_[device_info].push(port_number); |
} |
- task_thread_.message_loop()->PostTask( |
+ task_thread_.task_runner()->PostTask( |
FROM_HERE, |
base::Bind(&MidiServiceWinImpl::SetInputPortStateOnTaskThread, |
base::Unretained(this), port_number, |
@@ -854,11 +855,11 @@ class MidiServiceWinImpl : public MidiServiceWin, |
base::WideToUTF8(state_device_info.product_name), |
MmversionToString(state_device_info.driver_version), |
MIDI_PORT_OPENED); |
- task_thread_.message_loop()->PostTask( |
+ task_thread_.task_runner()->PostTask( |
FROM_HERE, base::Bind(&MidiServiceWinImpl::AddOutputPortOnTaskThread, |
base::Unretained(this), port_info)); |
} else { |
- task_thread_.message_loop()->PostTask( |
+ task_thread_.task_runner()->PostTask( |
FROM_HERE, |
base::Bind(&MidiServiceWinImpl::SetOutputPortStateOnTaskThread, |
base::Unretained(this), port_number, MIDI_PORT_CONNECTED)); |
@@ -895,7 +896,7 @@ class MidiServiceWinImpl : public MidiServiceWin, |
unused_output_ports_[device_info].push(port_number); |
state->closed = true; |
} |
- task_thread_.message_loop()->PostTask( |
+ task_thread_.task_runner()->PostTask( |
FROM_HERE, |
base::Bind(&MidiServiceWinImpl::SetOutputPortStateOnTaskThread, |
base::Unretained(this), port_number, |