Index: mojo/public/cpp/bindings/lib/connector.cc |
diff --git a/mojo/public/cpp/bindings/lib/connector.cc b/mojo/public/cpp/bindings/lib/connector.cc |
index 433e45e5825000145c175343cc2dee97a708404b..3dc79c5f0f73d763c35b8208a7a65f105fb2abe0 100644 |
--- a/mojo/public/cpp/bindings/lib/connector.cc |
+++ b/mojo/public/cpp/bindings/lib/connector.cc |
@@ -19,7 +19,7 @@ namespace mojo { |
Connector::Connector(ScopedMessagePipeHandle message_pipe, |
ConnectorConfig config, |
- scoped_refptr<base::SingleThreadTaskRunner> runner) |
+ scoped_refptr<base::SequencedTaskRunner> runner) |
: message_pipe_(std::move(message_pipe)), |
task_runner_(std::move(runner)), |
lock_(config == MULTI_THREADED_SEND ? new base::Lock : nullptr), |
@@ -38,7 +38,7 @@ Connector::~Connector() { |
return; |
} |
- DCHECK(thread_checker_.CalledOnValidThread()); |
+ DCHECK(sequence_checker_.CalledOnValidSequence()); |
CancelWait(); |
} |
@@ -48,7 +48,7 @@ void Connector::CloseMessagePipe() { |
} |
ScopedMessagePipeHandle Connector::PassMessagePipe() { |
- DCHECK(thread_checker_.CalledOnValidThread()); |
+ DCHECK(sequence_checker_.CalledOnValidSequence()); |
CancelWait(); |
internal::MayAutoLock locker(lock_.get()); |
@@ -62,13 +62,13 @@ ScopedMessagePipeHandle Connector::PassMessagePipe() { |
} |
void Connector::RaiseError() { |
- DCHECK(thread_checker_.CalledOnValidThread()); |
+ DCHECK(sequence_checker_.CalledOnValidSequence()); |
HandleError(true, true); |
} |
bool Connector::WaitForIncomingMessage(MojoDeadline deadline) { |
- DCHECK(thread_checker_.CalledOnValidThread()); |
+ DCHECK(sequence_checker_.CalledOnValidSequence()); |
if (error_) |
return false; |
@@ -90,7 +90,7 @@ bool Connector::WaitForIncomingMessage(MojoDeadline deadline) { |
} |
void Connector::PauseIncomingMethodCallProcessing() { |
- DCHECK(thread_checker_.CalledOnValidThread()); |
+ DCHECK(sequence_checker_.CalledOnValidSequence()); |
if (paused_) |
return; |
@@ -100,7 +100,7 @@ void Connector::PauseIncomingMethodCallProcessing() { |
} |
void Connector::ResumeIncomingMethodCallProcessing() { |
- DCHECK(thread_checker_.CalledOnValidThread()); |
+ DCHECK(sequence_checker_.CalledOnValidSequence()); |
if (!paused_) |
return; |
@@ -110,7 +110,7 @@ void Connector::ResumeIncomingMethodCallProcessing() { |
} |
bool Connector::Accept(Message* message) { |
- DCHECK(lock_ || thread_checker_.CalledOnValidThread()); |
+ DCHECK(lock_ || sequence_checker_.CalledOnValidSequence()); |
// It shouldn't hurt even if |error_| may be changed by a different thread at |
// the same time. The outcome is that we may write into |message_pipe_| after |
@@ -159,7 +159,7 @@ bool Connector::Accept(Message* message) { |
} |
void Connector::AllowWokenUpBySyncWatchOnSameThread() { |
- DCHECK(thread_checker_.CalledOnValidThread()); |
+ DCHECK(sequence_checker_.CalledOnValidSequence()); |
allow_woken_up_by_others_ = true; |
@@ -168,7 +168,7 @@ void Connector::AllowWokenUpBySyncWatchOnSameThread() { |
} |
bool Connector::SyncWatch(const bool* should_stop) { |
- DCHECK(thread_checker_.CalledOnValidThread()); |
+ DCHECK(sequence_checker_.CalledOnValidSequence()); |
if (error_) |
return false; |
@@ -203,7 +203,7 @@ void Connector::OnSyncHandleWatcherHandleReady(MojoResult result) { |
} |
void Connector::OnHandleReadyInternal(MojoResult result) { |
- DCHECK(thread_checker_.CalledOnValidThread()); |
+ DCHECK(sequence_checker_.CalledOnValidSequence()); |
if (result != MOJO_RESULT_OK) { |
HandleError(result != MOJO_RESULT_FAILED_PRECONDITION, false); |