Move Web Notifications to use Mojo

content/renderer/mojo/blink_service_registry_impl.cc

Index: content/renderer/mojo/blink_service_registry_impl.cc
diff --git a/content/renderer/mojo/blink_service_registry_impl.cc b/content/renderer/mojo/blink_service_registry_impl.cc
index 6a2fdf09a6abd87bca03d0ce8fa6ed7dc3724586..70484bd2b0efd9afd24c8cc7b42be4b80e22c6b4 100644
--- a/content/renderer/mojo/blink_service_registry_impl.cc
+++ b/content/renderer/mojo/blink_service_registry_impl.cc
@@ -6,19 +6,31 @@
 
 #include <utility>
 
+#include "base/single_thread_task_runner.h"
+#include "base/thread_task_runner_handle.h"
 #include "content/common/mojo/service_registry_impl.h"
 
 namespace content {
 
 BlinkServiceRegistryImpl::BlinkServiceRegistryImpl(
     base::WeakPtr<content::ServiceRegistry> service_registry)
-    : service_registry_(service_registry) {}
+    : service_registry_(service_registry),
+      main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()),
+      weak_ptr_factory_(this) {}
 
 BlinkServiceRegistryImpl::~BlinkServiceRegistryImpl() = default;
 
 void BlinkServiceRegistryImpl::connectToRemoteService(
     const char* name,
     mojo::ScopedMessagePipeHandle handle) {
+  if (!main_thread_task_runner_->BelongsToCurrentThread()) {
+    main_thread_task_runner_->PostTask(
+        FROM_HERE, base::Bind(&BlinkServiceRegistryImpl::connectToRemoteService,
+                              weak_ptr_factory_.GetWeakPtr(), name,
+                              base::Passed(std::move(handle))));
+    return;
+  }
+
   if (!service_registry_)
     return;