Move content's shell connections to the IO thread

chrome/browser/chromeos/chrome_interface_factory.h

Index: chrome/browser/chromeos/chrome_interface_factory.h
diff --git a/chrome/browser/chromeos/chrome_interface_factory.h b/chrome/browser/chromeos/chrome_interface_factory.h
index d8afb09fa0c2c07fe0fa539de29d4486ad640f60..3538bbc01778ab74576b82a9206fd66445914704 100644
--- a/chrome/browser/chromeos/chrome_interface_factory.h
+++ b/chrome/browser/chromeos/chrome_interface_factory.h
@@ -5,62 +5,25 @@
 #ifndef CHROME_BROWSER_CHROMEOS_CHROME_INTERFACE_FACTORY_H_
 #define CHROME_BROWSER_CHROMEOS_CHROME_INTERFACE_FACTORY_H_
 
-#include "ash/sysui/public/interfaces/wallpaper.mojom.h"
-#include "content/public/common/mojo_shell_connection.h"
-#include "mash/public/interfaces/launchable.mojom.h"
-#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/service.h"
-#include "ui/app_list/presenter/app_list_presenter.mojom.h"
-#include "ui/keyboard/keyboard.mojom.h"
-
-class AppListPresenterService;
-class ChromeLaunchable;
-class ChromeWallpaperManager;
-class KeyboardUIService;
+#include "base/macros.h"
+#include "base/memory/ref_counted.h"
+#include "base/single_thread_task_runner.h"
+#include "content/public/common/connection_filter.h"
 
 namespace chromeos {
 
 // InterfaceFactory for creating all services provided by chrome.
-class ChromeInterfaceFactory
-    : public shell::Service,
-      public shell::InterfaceFactory<keyboard::mojom::Keyboard>,
-      public shell::InterfaceFactory<mash::mojom::Launchable>,
-      public shell::InterfaceFactory<ash::sysui::mojom::WallpaperManager>,
-      public shell::InterfaceFactory<app_list::mojom::AppListPresenter> {
+class ChromeInterfaceFactory : public content::ConnectionFilter {
  public:
   ChromeInterfaceFactory();
   ~ChromeInterfaceFactory() override;
 
  private:
-  // shell::Service:
-  bool OnConnect(shell::Connection* connection) override;
-
-  // shell::InterfaceFactory<keyboard::Keyboard>:
-  void Create(
-      shell::Connection* connection,
-      mojo::InterfaceRequest<keyboard::mojom::Keyboard> request) override;
-
-  // mojo::InterfaceFactory<mash::mojom::Launchable>
-  void Create(shell::Connection* connection,
-              mash::mojom::LaunchableRequest request) override;
-
-  // mojo::InterfaceFactory<ash::sysui::mojom::WallpaperManager>
-  void Create(shell::Connection* connection,
-              ash::sysui::mojom::WallpaperManagerRequest request) override;
-
-  // mojo::InterfaceFactory<app_list::AppListPresenter>:
-  void Create(shell::Connection* connection,
-              mojo::InterfaceRequest<app_list::mojom::AppListPresenter> request)
-      override;
+  // content::ConnectionFilter:
+  bool OnConnect(shell::Connection* connection,
+                 shell::Connector* connector) override;
 
-  std::unique_ptr<KeyboardUIService> keyboard_ui_service_;
-  mojo::BindingSet<keyboard::mojom::Keyboard> keyboard_bindings_;
-  std::unique_ptr<ChromeLaunchable> launchable_;
-  std::unique_ptr<ChromeWallpaperManager> wallpaper_manager_;
-  std::unique_ptr<AppListPresenterService> app_list_presenter_service_;
-  mojo::BindingSet<app_list::mojom::AppListPresenter>
-      app_list_presenter_bindings_;
+  scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeInterfaceFactory);
 };