Index: mojo/public/cpp/bindings/associated_interface_ptr.h |
diff --git a/mojo/public/cpp/bindings/associated_interface_ptr.h b/mojo/public/cpp/bindings/associated_interface_ptr.h |
index 42cb9dc68e5e5426436f98b29ec791a27dc4af65..02eb4126806f276cf554bee2f672a66a69a212f2 100644 |
--- a/mojo/public/cpp/bindings/associated_interface_ptr.h |
+++ b/mojo/public/cpp/bindings/associated_interface_ptr.h |
@@ -14,8 +14,8 @@ |
#include "base/logging.h" |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
-#include "base/single_thread_task_runner.h" |
-#include "base/threading/thread_task_runner_handle.h" |
+#include "base/sequenced_task_runner.h" |
+#include "base/threading/sequenced_task_runner_handle.h" |
#include "mojo/public/cpp/bindings/associated_group.h" |
#include "mojo/public/cpp/bindings/associated_interface_ptr_info.h" |
#include "mojo/public/cpp/bindings/associated_interface_request.h" |
@@ -67,8 +67,8 @@ class AssociatedInterfacePtr { |
// AssociatedGroup.CreateAssociatedInterface() about when you can use this |
// object to make calls. |
void Bind(AssociatedInterfacePtrInfo<Interface> info, |
- scoped_refptr<base::SingleThreadTaskRunner> runner = |
- base::ThreadTaskRunnerHandle::Get()) { |
+ scoped_refptr<base::SequencedTaskRunner> runner = |
+ base::SequencedTaskRunnerHandle::Get()) { |
reset(); |
bool is_local = info.handle().is_local(); |
@@ -215,8 +215,8 @@ template <typename Interface> |
AssociatedInterfaceRequest<Interface> MakeRequest( |
AssociatedInterfacePtr<Interface>* ptr, |
AssociatedGroup* group, |
- scoped_refptr<base::SingleThreadTaskRunner> runner = |
- base::ThreadTaskRunnerHandle::Get()) { |
+ scoped_refptr<base::SequencedTaskRunner> runner = |
+ base::SequencedTaskRunnerHandle::Get()) { |
AssociatedInterfaceRequest<Interface> request; |
AssociatedInterfacePtrInfo<Interface> ptr_info; |
group->CreateAssociatedInterface(AssociatedGroup::WILL_PASS_REQUEST, |
@@ -230,8 +230,8 @@ AssociatedInterfaceRequest<Interface> MakeRequest( |
template <typename Interface> |
AssociatedInterfaceRequest<Interface> MakeRequestForTesting( |
AssociatedInterfacePtr<Interface>* ptr, |
- scoped_refptr<base::SingleThreadTaskRunner> runner = |
- base::ThreadTaskRunnerHandle::Get()) { |
+ scoped_refptr<base::SequencedTaskRunner> runner = |
+ base::SequencedTaskRunnerHandle::Get()) { |
MessagePipe pipe; |
using internal::MultiplexRouter; |
scoped_refptr<MultiplexRouter> router0 = new MultiplexRouter( |
@@ -272,13 +272,13 @@ AssociatedInterfaceRequest<Interface> GetIsolatedProxy( |
AssociatedInterfacePtr<Interface>* ptr) { |
MessagePipe pipe; |
scoped_refptr<internal::MultiplexRouter> router0 = |
- new internal::MultiplexRouter(std::move(pipe.handle0), |
- internal::MultiplexRouter::MULTI_INTERFACE, |
- false, base::ThreadTaskRunnerHandle::Get()); |
+ new internal::MultiplexRouter( |
+ std::move(pipe.handle0), internal::MultiplexRouter::MULTI_INTERFACE, |
+ false, base::SequencedTaskRunnerHandle::Get()); |
scoped_refptr<internal::MultiplexRouter> router1 = |
- new internal::MultiplexRouter(std::move(pipe.handle1), |
- internal::MultiplexRouter::MULTI_INTERFACE, |
- true, base::ThreadTaskRunnerHandle::Get()); |
+ new internal::MultiplexRouter( |
+ std::move(pipe.handle1), internal::MultiplexRouter::MULTI_INTERFACE, |
+ true, base::SequencedTaskRunnerHandle::Get()); |
ScopedInterfaceEndpointHandle endpoint0, endpoint1; |
router0->CreateEndpointHandlePair(&endpoint0, &endpoint1); |