Move content's shell connections to the IO thread

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 6b6d92f5b320ca3005b1618b71c9fd276e57e79a..cb65751ccb4355d057517e25dce4d5c68e09fea5 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -159,6 +159,7 @@
 #include "content/public/common/content_descriptors.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/mojo_shell_connection.h"
 #include "content/public/common/sandbox_type.h"
 #include "content/public/common/url_utils.h"
 #include "content/public/common/web_preferences.h"
@@ -2849,8 +2850,8 @@ void ChromeContentBrowserClient::RegisterInProcessMojoApplications(
 #if defined(OS_CHROMEOS)
 #if defined(MOJO_SHELL_CLIENT)
   if (chrome::IsRunningInMash()) {
-    content::MojoShellConnection::GetForProcess()->MergeService(
-        base::WrapUnique(new chromeos::ChromeInterfaceFactory));
+    content::MojoShellConnection::GetForProcess()->AddConnectionFilter(
+        base::MakeUnique<chromeos::ChromeInterfaceFactory>());
   }
 #endif  // MOJO_SHELL_CLIENT
 #endif  // OS_CHROMEOS