Index: ipc/ipc_sync_message_filter.cc |
diff --git a/ipc/ipc_sync_message_filter.cc b/ipc/ipc_sync_message_filter.cc |
index e49ebd640cb8ef1b95f7db18ece2db033b968732..faa97dbdf96c17c65d122aeb85b04dd6cbd6f96b 100644 |
--- a/ipc/ipc_sync_message_filter.cc |
+++ b/ipc/ipc_sync_message_filter.cc |
@@ -21,9 +21,6 @@ SyncMessageFilter::SyncMessageFilter(base::WaitableEvent* shutdown_event) |
shutdown_event_(shutdown_event) { |
} |
-SyncMessageFilter::~SyncMessageFilter() { |
-} |
- |
bool SyncMessageFilter::Send(Message* message) { |
{ |
base::AutoLock auto_lock(lock_); |
@@ -69,29 +66,6 @@ bool SyncMessageFilter::Send(Message* message) { |
return pending_message.send_result; |
} |
-void SyncMessageFilter::SendOnIOThread(Message* message) { |
- if (channel_) { |
- channel_->Send(message); |
- return; |
- } |
- |
- if (message->is_sync()) { |
- // We don't know which thread sent it, but it doesn't matter, just signal |
- // them all. |
- SignalAllEvents(); |
- } |
- |
- delete message; |
-} |
- |
-void SyncMessageFilter::SignalAllEvents() { |
- base::AutoLock auto_lock(lock_); |
- for (PendingSyncMessages::iterator iter = pending_sync_messages_.begin(); |
- iter != pending_sync_messages_.end(); ++iter) { |
- (*iter)->done_event->Signal(); |
- } |
-} |
- |
void SyncMessageFilter::OnFilterAdded(Channel* channel) { |
channel_ = channel; |
base::AutoLock auto_lock(lock_); |
@@ -125,4 +99,30 @@ bool SyncMessageFilter::OnMessageReceived(const Message& message) { |
return false; |
} |
+SyncMessageFilter::~SyncMessageFilter() { |
+} |
+ |
+void SyncMessageFilter::SendOnIOThread(Message* message) { |
+ if (channel_) { |
+ channel_->Send(message); |
+ return; |
+ } |
+ |
+ if (message->is_sync()) { |
+ // We don't know which thread sent it, but it doesn't matter, just signal |
+ // them all. |
+ SignalAllEvents(); |
+ } |
+ |
+ delete message; |
+} |
+ |
+void SyncMessageFilter::SignalAllEvents() { |
+ base::AutoLock auto_lock(lock_); |
+ for (PendingSyncMessages::iterator iter = pending_sync_messages_.begin(); |
+ iter != pending_sync_messages_.end(); ++iter) { |
+ (*iter)->done_event->Signal(); |
+ } |
+} |
+ |
} // namespace IPC |