Convert MimeRegistry to use mojo.

content/common/mojo/service_registry_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/mojo/service_registry_impl.h"
 
 #include <utility>
 
 #include "mojo/common/common_type_converters.h"
 
@@ skipping 24 matching lines @@
   CHECK(!remote_provider_);
   remote_provider_ = std::move(service_provider);
   while (!pending_connects_.empty()) {
     remote_provider_->GetInterface(
         mojo::String::From(pending_connects_.front().first),
         mojo::ScopedMessagePipeHandle(pending_connects_.front().second));
     pending_connects_.pop();
   }
 }
 
-void ServiceRegistryImpl::AddService(const std::string& service_name,
-                                     const ServiceFactory& service_factory) {
-  service_factories_[service_name] = service_factory;
+void ServiceRegistryImpl::AddService(
+    const std::string& service_name,
+    const ServiceFactory& service_factory,
+    const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) {
+  service_factories_[service_name] =
+      std::make_pair(service_factory, task_runner);
 }
 
 void ServiceRegistryImpl::RemoveService(const std::string& service_name) {
   service_factories_.erase(service_name);
 }
 
 void ServiceRegistryImpl::ConnectToRemoteService(
     base::StringPiece service_name,
     mojo::ScopedMessagePipeHandle handle) {
   auto override_it = service_overrides_.find(service_name.as_string());
@@ skipping 38 matching lines @@
     return;
   }
 
   // It's possible and effectively unavoidable that under certain conditions
   // an invalid handle may be received. Don't invoke the factory in that case.
   if (!client_handle.is_valid()) {
     DVLOG(2) << "Invalid pipe handle for " << name << " interface request.";
     return;
   }
 
-  it->second.Run(std::move(client_handle));
+  if (it->second.second) {
+    it->second.second->PostTask(
+        FROM_HERE,
+        base::Bind(&ServiceRegistryImpl::RunServiceFactoryOnTaskRunner,
+                   it->second.first, base::Passed(&client_handle)));
+    return;
+  }
+  it->second.first.Run(std::move(client_handle));
+}
+
+// static
+void ServiceRegistryImpl::RunServiceFactoryOnTaskRunner(
+    const ServiceRegistryImpl::ServiceFactory& factory,
+    mojo::ScopedMessagePipeHandle handle) {
+  factory.Run(std::move(handle));

[nasko, 2016/06/02 21:31:41]

More for my own education - where does Mojo guarantee that object constructed on
a specific thread is only called on the same thread?

[Sam McNally, 2016/06/02 23:49:39]

https://code.google.com/p/chromium/codesearch/#chromium/src/mojo/public/cpp/b...

 }
 
 void ServiceRegistryImpl::OnConnectionError() {
   binding_.Close();
 }
 
 }  // namespace content