Move content's shell connections to the IO thread

content/child/child_thread_impl.h

Index: content/child/child_thread_impl.h
diff --git a/content/child/child_thread_impl.h b/content/child/child_thread_impl.h
index 20c03e0e42f3877ecb18656874b2a47a3ed7285b..fb1be74d98f94360f740144980684fc785856c2c 100644
--- a/content/child/child_thread_impl.h
+++ b/content/child/child_thread_impl.h
@@ -23,7 +23,6 @@
 #include "ipc/ipc_message.h"  // For IPC_MESSAGE_LOG_ENABLED.
 #include "ipc/ipc_platform_file.h"
 #include "ipc/message_router.h"
-#include "services/shell/public/cpp/shell_client.h"
 
 namespace base {
 class MessageLoop;
@@ -68,8 +67,7 @@ struct RequestInfo;
 // The main thread of a child process derives from this class.
 class CONTENT_EXPORT ChildThreadImpl
     : public IPC::Listener,
-      virtual public ChildThread,
-      public NON_EXPORTED_BASE(shell::ShellClient){
+      virtual public ChildThread {
  public:
   struct CONTENT_EXPORT Options;
 
@@ -101,10 +99,6 @@ class CONTENT_EXPORT ChildThreadImpl
   shell::InterfaceRegistry* GetInterfaceRegistry() override;
   shell::InterfaceProvider* GetRemoteInterfaces() override;
 
-  // shell::ShellClient:
-  shell::InterfaceRegistry* GetInterfaceRegistryForConnection() override;
-  shell::InterfaceProvider* GetInterfaceProviderForConnection() override;
-
   IPC::SyncChannel* channel() { return channel_.get(); }
 
   IPC::MessageRouter* GetRouter();
@@ -309,7 +303,10 @@ class CONTENT_EXPORT ChildThreadImpl
 
   scoped_refptr<base::SequencedTaskRunner> browser_process_io_runner_;
 
-  base::WeakPtrFactory<ChildThreadImpl> channel_connected_factory_;
+  std::unique_ptr<base::WeakPtrFactory<ChildThreadImpl>>
+      channel_connected_factory_;
+
+  base::WeakPtrFactory<ChildThreadImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildThreadImpl);
 };